From: Christian Femers Date: Mon, 16 Sep 2019 00:16:05 +0000 (+0200) Subject: The final restructured version for automatic build using maven tycho X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=7d05144c25daa53e60fc9ed9fd503546a86567f8 The final restructured version for automatic build using maven tycho This can be extended to automatically deploy the updatesite to e.g. ftp. The difference to the previous CI approach is the flatter structure of the project and some pipeline improvements. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9224174c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +target/ +bin/ +*.class +.flattened-pom.xml +pom.tycho +**.polyglot* +**.takari* +**.META-INF_MANIFEST.MF \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..27530738 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,54 @@ +# This file is a template, and might need editing before it works on your project. + +# Build JAVA applications using Apache Maven (http://maven.apache.org) +# For docker image tags see https://hub.docker.com/_/maven/ +# +# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html + +# This template will build and test your projects +# * Caches downloaded dependencies and plugins between invocation. +# * Verify but don't deploy merge requests. +# * Deploy built artifacts from master branch only. + +variables: + GIT_SUBMODULE_STRATEGY: recursive + # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log. + # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # when running from the command line. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" + +# This template uses jdk11 for verifying and deploying images +image: maven:3.6.1-jdk-11 # Maven 3.6.2 will currently NOT WORK! + +# Cache downloaded dependencies and plugins between builds. +# To keep cache across branches add 'key: "$CI_JOB_NAME"' +cache: + key: "$CI_COMMIT_REF_SLUG" + paths: + - .m2/repository + +stages: + - validate + - test + +default: + before_script: + - mvn $MAVEN_CLI_OPTS clean # This is only temporary to resolve TYCHO 1.5.0-SNAPSHOT for the main build + - cd net.mograsim + +validate: + stage: validate + script: + - mvn $MAVEN_CLI_OPTS clean validate + +test: + stage: test + script: + - mvn $MAVEN_CLI_OPTS verify + artifacts: + reports: + junit: + - tests/*/target/surefire-reports/TEST-*.xml diff --git a/.gitmodules b/.gitmodules index 74725734..3f39c8a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "SWTHelper"] - path = SWTHelper - url = https://github.com/Haspamelodica/SWTHelper - branch = master + path = SWTHelper/bundles + url = https://github.com/Haspamelodica/SWTHelper.git diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 00000000..e06fb0e5 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,9 @@ + + + + org.eclipse.tycho.extras + tycho-pomless + 1.5.0-SNAPSHOT + + \ No newline at end of file diff --git a/.project b/.project new file mode 100644 index 00000000..e4bb21ad --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + eragp-misim-2019 + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/MAVEN-TYCHO-README.MD b/MAVEN-TYCHO-README.MD new file mode 100644 index 00000000..0682faec --- /dev/null +++ b/MAVEN-TYCHO-README.MD @@ -0,0 +1,247 @@ +# Mograsim Development Environment + +_Mograsim Development Documentation Version 0.1 --- 2019-09-13_ + +A short guide to the Mograsim Maven Tycho configuration and Maven Tycho in general, +as well as some information on Eclipse Plugin Development and OSGi. + + +## Maven Tycho + +[Maven Tycho](https://www.eclipse.org/tycho/sitedocs/index.html) is a plugin for +[Maven](http://maven.apache.org) that allows building Eclipse and OSGi Projects comfortably +and automatically using Maven. + +Useful links: +- [eclipse.org/tycho](https://www.eclipse.org/tycho/) +- [wiki.eclipse.org/Category:Tycho](https://wiki.eclipse.org/Category:Tycho) +- [vogella.com/tutorials/EclipseTycho](https://www.vogella.com/tutorials/EclipseTycho/article.html) +- [eclipse.org/tycho/sitedocs](https://www.eclipse.org/tycho/sitedocs/index.html) +- [Tycho pomless sources](https://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/tree/tycho-pomless/src/main/java/org/eclipse/tycho/pomless) + (see *Mapping for naming and other conventions, TychoAggregatorMapping for folders) + +## OSGi + +OSGi is a module system for Java (completely unrelated to the Java 9 Jigsaw module +system) that allows detailed control over modules, dependencies, versions and more. +The file associated with OSGi here is a specific MANIFEST.MF in the META-INF directory +of each project. + +Roughly, an OSGi bundle has: +- a **symbolic name** that acts as an identifier, therefore it should be unique and + must not be changed, otherwise it a large portion of the configuration would break. + Never change that field after distribution. +- a **bundle name** and **bundle vendor**; this is only for the users and developers + and is not constrained in any way. You can change that, but it should be consistent + across all Mograsim modules. Both can be externalized to +- a **bundle version** that denotes current the version of the bundle. The `qualifier` + is replaced during the build process with a timestamp of the format `YYYYMMDDhhmmss`. + The version itself can be set using the maven tycho version plugin, which replaces + not only the maven versions, but all (equivalent) versions in the MANIFEST as well. +- a **bundle required execution environment** (abbr. BREE) where the bundle's *minimal* + JDK version is set. This is also the one eclipse uses and displays as JRE System + Library in the Eclipse projects.
This should be the same as the one the target + definition used for the build and the same that maven is run with ( -> check the + Run Configuration) + +## Eclipse Plugins + +- Short explanation of the different names and terms used in Eclipse Plugin Dev, + and short introduction to the different mechanisms used. + +## Mograsim Structure + +The tree of Mograsim projects: + +- `bundles` - _This contains all bundles/plugins that provide functionality to Mograsim_ + - `extenal/swthelper` - _This contains the [SWTHelper](https://github.com/Haspamelodica/SWTHelper) + git submodule._ + - `bundles` - _This submodule folder needs to be named like that for Tycho + pom-less build to work._ + - _SWTInput_ - _unused_ + - **SWTObjectWrappers** - SWT object abstractions to enable zooming and + optimizations. + - _SWTSystemInOutApplication_ - _unused_ + - _SWTTiledZoomableCanvas_ - _unused_ + - **SWTZoomableCanvas** - The SWT canvas we draw the simulation in. + - **net.mograsim.logic.core**
The core logic for pure simulation. This contains + the most important low-level logic circuits and gates and defines how that + logic gets simulated. The underlying system for simulation in Mograsim is an + event based approach (see `Timeline`), using VHDL-like logic defined in `Bit` + and `BitVector`. More complex ciruits are build out of `Wire`s connecting `Component`s. + - **net.mograsim.logic.model**
The model describes how that core logic is + displayed and arranged, and allows (de-)serialization to JSON. The core logic + model gets generated based on this. Every basic net.mograsim.logic.core Component + has a model equivalent here that represents it in the GUI and persisted state + (JSON). + - **net.mograsim.logic.model.editor**
This bundle contains a standalone + SWT-based editor to edit Mograsim JSON-models in a comfortable way. It can + be used to create a new `SubmodelComponent` by arranging existing ones to a + new component. Note that editing and simulation are entirely different processes + in Mograsim, the editor cannot simulate and a running simulation cannot be + edited. (At least in the current state) + - **net.mograsim.logic.model.am2900**
This plugin contains a model for the + AMD Am2900 Family Microprocessors arranged into a microprogrammable model. + This can be used in the microprogram editor of the Mograsim plugin and in the + Mograsim assembler editor (by using a properly set up instruction set). We + took care that the plugin is independent, meaning that it only provides an + implementation for an extension point of the net.mograsim.machine plugin and + no other Mograsim depends on it.
This is also the way to go if you want + to add your own machine definitions to Mograsim and use them there. + - **net.mograsim.machine**
The machine plugin defines an extension point + that can be extended and implemented in other (your own) plugins to provide + new machines to Mograsim. In addition to the extension point and the most important + interfaces, it contains some commonly required or useful components to build/define + another machine. net.mograsim.logic.model.am2900 for example is such an extension. + The machine plugin itself scans for all available implementations of the interface + given by the extension point, and other parts of the Mograsim plugin get access + to them that way. + - **net.mograsim.plugin.core**
This is - as the name says - the core plugin + of mograsim. Here lie all the Eclipse Platform specific parts that make Mograsim + as an Eclipse plugin work. This includes the different editors, view, settings + and other functional extension to the Eclipse IDE. + - **net.mograsim.plugin.core.nl_de**
This optional plugin provides a German + localization for Mograsim. + - **net.mograsim.plugin.branding**
This contains elements for branding the + feature plugin, and additional resources and raw files (original logo and icon + in SVG and Adobe Illustrator and similar). + - **net.mograsim.plugin.docs**
The Plugin providing the user documentation. + - **net.mograsim.preferences**
A plugin for managing and accessing preferences. +- `features` - _This contains all Mograsim feature plugins_ + - **net.mograsim.feature**
The Mograsim feature plugin, containing all the + plugins above and combining them into a feature. A feature is a plugin collection + with additional properties that allows for easy installation by the end user. + For this purpose, it also contains license information, authors, updatesite + location (allows eclipse to automatically check if updates are available) and + more. +- `products` - _This contains standalone Mograsim product(s)_ + - **net.mograsim.product**
A product can be pretty much anything (see Eclipse + RCP), in our case, this is simply a pre-configured Eclipse package, comparable + to the packages located at [www.eclipse.org/downloads/packages](https://www.eclipse.org/downloads/packages/). +- `releng` - _Abbreviation for **Rel**ease **Eng**ineering, contains important configuration_ + - **net.mograsim.configuration**
This contains the configuration for the + Mograsim project and the build in particular. The central Maven configuration + is located here in a single `pom.xml`, that is the super-parent of all others, + including the generated ones. + - **net.mograsim.updatesite**
This updatesite project collects features + in form of an update site that can be accessed by Eclipse to install new features + or update features. The features are grouped into categories which can come + with further descriptions. The `target/repository/` is the part of the whole + Mograsim project that actually gets deployed. By using Help -> Install New + Software -> Add -> Local, the `repository`-folder can be selected and features + can be installed offline, e.g. to test them. + - **net.mograsim.target**
The target definition for the build. This is a + well-defined environment that we expect the plugins to work in/with. That includes + all plugin dependencies (like all plugins the Eclipse Platform is comprised + of) and the (minimum) JRE that is expected. Some plugins exclusively for testing + are included here, too. +- `tests` - _This contains (integration-like) tests in form of plugin fragments_ + - **net.mograsim.logic.tests** + - **net.mograsim.logic.model.am2900.tests** + - **net.mograsim.machine.tests** + +## Build Mograsim + +Use the main aggregator `pom.xml` next to this markdown file to build mograsim, take +care to use the correct JDK to run it (see Run Configuration). + +A short guide to the [Maven goals (Maven Lifecycle)](https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html): +- The `clean` goal will remove all `target`-folders and other generated files like + flattened poms and polyglot build artifacts (all are listed in `.gitignore`). +- The `validate` goal is useful to simply check if the setup itself (Maven Tycho) + is ok and everything needed is available. +- The `integration-test` goal will run the test plugins, the `test` goal beforehand + **will not.** +- I recommend running `clean verify` or `verify`, this will do everything up to and + including the testing. + +Please note that Tycho 1.5.0 is not released yet, and thus requires a workaround. +More information can be found under [Maven Core Extension Problems](#mceps). + +## Challenges + +Not everything is as simple as it seems at first glance. + +### Maven Core Extension Problems + +The Tycho extra `tycho-pomless` is a Maven core extension allows for simpler structure +and less redundancy. Maven core extensions must be available at [the central maven repository](http://repo.maven.apache.org/maven2/) +(or already in the local repository), you cannot specify an alternative remote repository +in `.mvn/extensions.xml`. If a core extension cannot be resolved, you will get currently +(Maven 3.6.2) only a warning like + +> [WARNING] The POM for org.eclipse.tycho.extras:tycho-pomless:jar:1.5.0-SNAPSHOT is missing, no dependency information available + +This means that the extension was not found, and it cannot be used, which leads to +a failure later on. To get around that, create a dummy pom that only serves the purpose +to "request" and resolve the extension: + +```xml + + 4.0.0 + net.mograsim + net.mograsim.tycho-download + 1.0.0 + pom + + + + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + + true + + + true + always + + + + + + + + org.eclipse.tycho.extras + tycho-pomless + 1.5.0-SNAPSHOT + + + + +``` +While that this is not the most compact way, it can be run by the developer and build +server equally easy and does not require special CLI knowledge. As developer, you +need to run that only once (in Eclipse: right click on pom.xml -> Run As -> Maven +clean). For continuous integration, you can insert one more line in the YAML (or +equivalent), like in our case ` - mvn $MAVEN_CLI_OPTS clean`. + +### Git Submodules + +Git submodules are a challenge with a tycho build, because the projects that reside +in it need to be build, too. But not only that, they need to use the same configuration +for the build, which is problematic if you do not have control over them. The solution +only exists with Tycho 1.5.0 (currently only as snapshot), where deep folder structures +are automatically scanned and poms get gnereated; not every folder requires an aggregator +pom. This however requires (at the moment) certain naming conventions (see section +on Tycho itself). + +In our case, [SWTHelper](https://github.com/Haspamelodica/SWTHelper) is a git submodule +containing several plain Java Eclipse projects with OSGi configuration (MANIFEST.MF), +which is the reason this works at all. Due to the naming conventions, the submodule +folder is named `bundles`. + +### Maven incompatibility + +Maven 3.6.2 is currently incompatible with Tycho <= 1.5.0. + +If you encounter + +> [FATAL] Non-readable POM "somepath"\tests\.polyglot.pom.tycho: input contained no data @ + +or + +> [FATAL] Non-readable POM "somepath"\bundles\net.mograsim.logic.core\.polyglot..META-INF_MANIFEST.MF: input contained no data @ + +make sure to use Maven 3.6.1 to fix that (this is the default Eclipse embedded Maven +at the moment). diff --git a/MAVEN-TYCHO-README.html b/MAVEN-TYCHO-README.html new file mode 100644 index 00000000..41829c29 --- /dev/null +++ b/MAVEN-TYCHO-README.html @@ -0,0 +1,251 @@ + + + + + + + + + +

Mograsim Development Environment

Mograsim Development Documentation Version 0.1 — 2019-09-13

A short guide to the Mograsim Maven Tycho configuration and Maven Tycho in general, +as well as some information on Eclipse Plugin Development and OSGi.

Maven Tycho

Maven Tycho is a plugin for +Maven that allows building Eclipse and OSGi Projects comfortably +and automatically using Maven.

Useful links:

eclipse.org/tycho
wiki.eclipse.org/Category:Tycho
vogella.com/tutorials/EclipseTycho
eclipse.org/tycho/sitedocs
Tycho pomless sources +(see *Mapping for naming and other conventions, TychoAggregatorMapping for folders)

OSGi

OSGi is a module system for Java (completely unrelated to the Java 9 Jigsaw module +system) that allows detailed control over modules, dependencies, versions and more. +The file associated with OSGi here is a specific MANIFEST.MF in the META-INF directory +of each project.

Roughly, an OSGi bundle has:

a symbolic name that acts as an identifier, therefore it should be unique and +must not be changed, otherwise it a large portion of the configuration would break. +Never change that field after distribution.
a bundle name and bundle vendor; this is only for the users and developers +and is not constrained in any way. You can change that, but it should be consistent +across all Mograsim modules. Both can be externalized to
a bundle version that denotes current the version of the bundle. The qualifier +is replaced during the build process with a timestamp of the format YYYYMMDDhhmmss. +The version itself can be set using the maven tycho version plugin, which replaces +not only the maven versions, but all (equivalent) versions in the MANIFEST as well.
a bundle required execution environment (abbr. BREE) where the bundle's minimal +JDK version is set. This is also the one eclipse uses and displays as JRE System +Library in the Eclipse projects.
This should be the same as the one the target +definition used for the build and the same that maven is run with ( -> check the +Run Configuration)

Eclipse Plugins

Short explanation of the different names and terms used in Eclipse Plugin Dev, +and short introduction to the different mechanisms used.

Mograsim Structure

The tree of Mograsim projects:

bundles - This contains all bundles/plugins that provide functionality to Mograsim
- extenal/swthelper - This contains the SWTHelper +git submodule.
  - bundles - This submodule folder needs to be named like that for Tycho +pom-less build to work.
    - SWTInput - unused
    - SWTObjectWrappers - SWT object abstractions to enable zooming and +optimizations.
    - SWTSystemInOutApplication - unused
    - SWTTiledZoomableCanvas - unused
    - SWTZoomableCanvas - The SWT canvas we draw the simulation in.
    +
  +
- net.mograsim.logic.core
  The core logic for pure simulation. This contains +the most important low-level logic circuits and gates and defines how that +logic gets simulated. The underlying system for simulation in Mograsim is an +event based approach (see Timeline), using VHDL-like logic defined in Bit +and BitVector. More complex ciruits are build out of Wires connecting Components.
- net.mograsim.logic.model
  The model describes how that core logic is +displayed and arranged, and allows (de-)serialization to JSON. The core logic +model gets generated based on this. Every basic net.mograsim.logic.core Component +has a model equivalent here that represents it in the GUI and persisted state +(JSON).
- net.mograsim.logic.model.editor
  This bundle contains a standalone +SWT-based editor to edit Mograsim JSON-models in a comfortable way. It can +be used to create a new SubmodelComponent by arranging existing ones to a +new component. Note that editing and simulation are entirely different processes +in Mograsim, the editor cannot simulate and a running simulation cannot be +edited. (At least in the current state)
- net.mograsim.logic.model.am2900
  This plugin contains a model for the +AMD Am2900 Family Microprocessors arranged into a microprogrammable model. +This can be used in the microprogram editor of the Mograsim plugin and in the +Mograsim assembler editor (by using a properly set up instruction set). We +took care that the plugin is independent, meaning that it only provides an +implementation for an extension point of the net.mograsim.machine plugin and +no other Mograsim depends on it.
  This is also the way to go if you want +to add your own machine definitions to Mograsim and use them there.
- net.mograsim.machine
  The machine plugin defines an extension point +that can be extended and implemented in other (your own) plugins to provide +new machines to Mograsim. In addition to the extension point and the most important +interfaces, it contains some commonly required or useful components to build/define +another machine. net.mograsim.logic.model.am2900 for example is such an extension. +The machine plugin itself scans for all available implementations of the interface +given by the extension point, and other parts of the Mograsim plugin get access +to them that way.
- net.mograsim.plugin.core
  This is - as the name says - the core plugin +of mograsim. Here lie all the Eclipse Platform specific parts that make Mograsim +as an Eclipse plugin work. This includes the different editors, view, settings +and other functional extension to the Eclipse IDE.
- net.mograsim.plugin.core.nl_de
  This optional plugin provides a German +localization for Mograsim.
- net.mograsim.plugin.branding
  This contains elements for branding the +feature plugin, and additional resources and raw files (original logo and icon +in SVG and Adobe Illustrator and similar).
- net.mograsim.plugin.docs
  The Plugin providing the user documentation.
- net.mograsim.preferences
  A plugin for managing and accessing preferences.
+
features - This contains all Mograsim feature plugins
- net.mograsim.feature
  The Mograsim feature plugin, containing all the +plugins above and combining them into a feature. A feature is a plugin collection +with additional properties that allows for easy installation by the end user. +For this purpose, it also contains license information, authors, updatesite +location (allows eclipse to automatically check if updates are available) and +more.
+
products - This contains standalone Mograsim product(s)
- net.mograsim.product
  A product can be pretty much anything (see Eclipse +RCP), in our case, this is simply a pre-configured Eclipse package, comparable +to the packages located at www.eclipse.org/downloads/packages.
+
releng - Abbreviation for Release Engineering, contains important configuration
- net.mograsim.configuration
  This contains the configuration for the +Mograsim project and the build in particular. The central Maven configuration +is located here in a single pom.xml, that is the super-parent of all others, +including the generated ones.
- net.mograsim.updatesite
  This updatesite project collects features +in form of an update site that can be accessed by Eclipse to install new features +or update features. The features are grouped into categories which can come +with further descriptions. The target/repository/ is the part of the whole +Mograsim project that actually gets deployed. By using Help -> Install New +Software -> Add -> Local, the repository-folder can be selected and features +can be installed offline, e.g. to test them.
- net.mograsim.target
  The target definition for the build. This is a +well-defined environment that we expect the plugins to work in/with. That includes +all plugin dependencies (like all plugins the Eclipse Platform is comprised +of) and the (minimum) JRE that is expected. Some plugins exclusively for testing +are included here, too.
+
tests - This contains (integration-like) tests in form of plugin fragments
- net.mograsim.logic.tests
- net.mograsim.logic.model.am2900.tests
- net.mograsim.machine.tests
+

Build Mograsim

Use the main aggregator pom.xml next to this markdown file to build mograsim, take +care to use the correct JDK to run it (see Run Configuration).

A short guide to the Maven goals (Maven Lifecycle):

The clean goal will remove all target-folders and other generated files like +flattened poms and polyglot build artifacts (all are listed in .gitignore).
The validate goal is useful to simply check if the setup itself (Maven Tycho) +is ok and everything needed is available.
The integration-test goal will run the test plugins, the test goal beforehand +will not.
I recommend running clean verify or verify, this will do everything up to and +including the testing.

Please note that Tycho 1.5.0 is not released yet, and thus requires a workaround. +More information can be found under Maven Core Extension Problems.

Challenges

Not everything is as simple as it seems at first glance.

Maven Core Extension Problems

The Tycho extra tycho-pomless is a Maven core extension allows for simpler structure +and less redundancy. Maven core extensions must be available at the central maven repository +(or already in the local repository), you cannot specify an alternative remote repository +in .mvn/extensions.xml. If a core extension cannot be resolved, you will get currently +(Maven 3.6.2) only a warning like

[WARNING] The POM for org.eclipse.tycho.extras:tycho-pomless:jar:1.5.0-SNAPSHOT is missing, no dependency information available
+

This means that the extension was not found, and it cannot be used, which leads to +a failure later on. To get around that, create a dummy pom that only serves the purpose +to “request” and resolve the extension:

<project .. bla .. bla ..>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>net.mograsim</groupId>
+    <artifactId>net.mograsim.tycho-download</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <pluginRepositories>
+        <!-- currently necessary because we are using a SNAPSHOT build of tycho -->
+        <pluginRepository>
+            <id>tycho-snapshots</id>
+            <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-pomless</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+            </extension>
+        </extensions>
+    </build>
+</project>
+

While that this is not the most compact way, it can be run by the developer and build +server equally easy and does not require special CLI knowledge. As developer, you +need to run that only once (in Eclipse: right click on pom.xml -> Run As -> Maven +clean). For continuous integration, you can insert one more line in the YAML (or +equivalent), like in our case - mvn $MAVEN_CLI_OPTS clean.

Git Submodules

Git submodules are a challenge with a tycho build, because the projects that reside +in it need to be build, too. But not only that, they need to use the same configuration +for the build, which is problematic if you do not have control over them. The solution +only exists with Tycho 1.5.0 (currently only as snapshot), where deep folder structures +are automatically scanned and poms get gnereated; not every folder requires an aggregator +pom. This however requires (at the moment) certain naming conventions (see section +on Tycho itself).

In our case, SWTHelper is a git submodule +containing several plain Java Eclipse projects with OSGi configuration (MANIFEST.MF), +which is the reason this works at all. Due to the naming conventions, the submodule +folder is named bundles.

Maven incompatibility

Maven 3.6.2 is currently incompatible with Tycho <= 1.5.0.

If you encounter

[FATAL] Non-readable POM “somepath”\tests.polyglot.pom.tycho: input contained no data @
+

[FATAL] Non-readable POM “somepath”\bundles\net.mograsim.logic.core.polyglot..META-INF_MANIFEST.MF: input contained no data @
+

make sure to use Maven 3.6.1 to fix that (this is the default Eclipse embedded Maven +at the moment).

+ + \ No newline at end of file diff --git a/SWTHelper b/SWTHelper deleted file mode 160000 index 78574589..00000000 --- a/SWTHelper +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7857458991642e998c691d9b65d5a9bf7f7bbfae diff --git a/SWTHelper/bundles b/SWTHelper/bundles new file mode 160000 index 00000000..78574589 --- /dev/null +++ b/SWTHelper/bundles @@ -0,0 +1 @@ +Subproject commit 7857458991642e998c691d9b65d5a9bf7f7bbfae diff --git a/SWTHelper/pom.xml b/SWTHelper/pom.xml new file mode 100644 index 00000000..c583e163 --- /dev/null +++ b/SWTHelper/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + net.mograsim.swthelper + pom + + + net.mograsim + net.mograsim + ${revision}${changelist} + + + + bundles + + \ No newline at end of file diff --git a/TempMavenTychoSnapshotWorkaround/.project b/TempMavenTychoSnapshotWorkaround/.project new file mode 100644 index 00000000..872cf5e6 --- /dev/null +++ b/TempMavenTychoSnapshotWorkaround/.project @@ -0,0 +1,17 @@ + + + TempMavenTychoSnapshotWorkaround + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/TempMavenTychoSnapshotWorkaround/pom.xml b/TempMavenTychoSnapshotWorkaround/pom.xml new file mode 100644 index 00000000..8c6713f0 --- /dev/null +++ b/TempMavenTychoSnapshotWorkaround/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + net.mograsim + net.mograsim.tycho-download + 1.0.0 + pom + + + + + + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + + true + + + true + always + + + + + + + + org.eclipse.tycho.extras + tycho-pomless + 1.5.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/features/net.mograsim.feature/.project b/features/net.mograsim.feature/.project new file mode 100644 index 00000000..254cd9e2 --- /dev/null +++ b/features/net.mograsim.feature/.project @@ -0,0 +1,21 @@ + + + net.mograsim.feature + + + net.mograsim.logic.model.am2900 + net.mograsim.plugin.branding + net.mograsim.plugin.core + net.mograsim.plugin.docs + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/net.mograsim.feature/.settings/org.eclipse.core.resources.prefs b/features/net.mograsim.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..99f26c02 --- /dev/null +++ b/features/net.mograsim.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/features/net.mograsim.feature/build.properties b/features/net.mograsim.feature/build.properties new file mode 100644 index 00000000..64f93a9f --- /dev/null +++ b/features/net.mograsim.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/net.mograsim.feature/feature.xml b/features/net.mograsim.feature/feature.xml new file mode 100644 index 00000000..7e121014 --- /dev/null +++ b/features/net.mograsim.feature/feature.xml @@ -0,0 +1,770 @@ + + + + + Mograsim - Modular Graphical Simulator + +For teaching microprogramming, ISAs and circuit logic at the Technical University of Munich (TUM). +By Christian Femers, Daniel Kirschten and Fabian Stemmler + + + + Copyright (c) 2019 Christian Femers, Daniel Kirschten and Fabian Stemmler + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +This Source Code may also be made available under the following Secondary +Licenses when the conditions for such availability set forth in the Eclipse +Public License, v. 2.0 are satisfied: GNU General Public License, version 2 +with the GNU Classpath Exception which is +available at https://www.gnu.org/software/classpath/license.html. + +SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + + + + This program and the accompanying materials are made available under the +terms of the Eclipse Public License 2.0 which is available at +http://www.eclipse.org/legal/epl-2.0, or GNU General Public License, +version 2 with the GNU Classpath Exception which is available at +https://www.gnu.org/software/classpath/license.html. + +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/net.mograsim.feature/sourceTemplateFeature/.gitkeep b/features/net.mograsim.feature/sourceTemplateFeature/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/net.mograsim.logic.core/.classpath b/net.mograsim.logic.core/.classpath deleted file mode 100644 index da70a87e..00000000 --- a/net.mograsim.logic.core/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/net.mograsim.logic.core/.gitignore b/net.mograsim.logic.core/.gitignore deleted file mode 100644 index 265a1ae2..00000000 --- a/net.mograsim.logic.core/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -/bin/ -*.log - -# package files -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# vm crash logs -hs_err_pid* \ No newline at end of file diff --git a/net.mograsim.logic.core/.project b/net.mograsim.logic.core/.project deleted file mode 100644 index 2f347c0a..00000000 --- a/net.mograsim.logic.core/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - net.mograsim.logic.core - - - net.mograsim.preferences - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/net.mograsim.logic.core/.settings/org.eclipse.core.resources.prefs b/net.mograsim.logic.core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/net.mograsim.logic.core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/net.mograsim.logic.core/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.logic.core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index e5f98893..00000000 --- a/net.mograsim.logic.core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,468 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=info -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=info -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=140 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=140 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/net.mograsim.logic.core/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.logic.core/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 94658822..00000000 --- a/net.mograsim.logic.core/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,63 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_MoGraSim -formatter_settings_version=16 -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=false -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=true -sp_cleanup.convert_to_enhanced_for_loop=true -sp_cleanup.correct_indentation=true -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=true -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=true -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=true -sp_cleanup.remove_redundant_semicolons=true -sp_cleanup.remove_redundant_type_arguments=true -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=true -sp_cleanup.remove_unused_imports=true -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=true -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=true -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/net.mograsim.logic.core/META-INF/MANIFEST.MF b/net.mograsim.logic.core/META-INF/MANIFEST.MF deleted file mode 100644 index 2aff2ab9..00000000 --- a/net.mograsim.logic.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-SymbolicName: net.mograsim.logic.core -Bundle-Version: 0.1.0.qualifier -Export-Package: net.mograsim.logic.core, - net.mograsim.logic.core.components, - net.mograsim.logic.core.components.gates, - net.mograsim.logic.core.timeline, - net.mograsim.logic.core.types, - net.mograsim.logic.core.wires -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: net.mograsim.logic.core -Bundle-Vendor: Mograsim Team -Require-Bundle: net.mograsim.preferences;bundle-version="0.1.0" diff --git a/net.mograsim.logic.core/OSGI-INF/l10n/bundle.properties b/net.mograsim.logic.core/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 8ea411e4..00000000 --- a/net.mograsim.logic.core/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for net.mograsim.logic.core -Bundle-Vendor = Mograsim Team -Bundle-Name = Mograsim logic core \ No newline at end of file diff --git a/net.mograsim.logic.core/build.properties b/net.mograsim.logic.core/build.properties deleted file mode 100644 index d6642e65..00000000 --- a/net.mograsim.logic.core/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/ diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObservable.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObservable.java deleted file mode 100644 index 3a51c27c..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObservable.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.mograsim.logic.core; - -public interface LogicObservable -{ - public void registerObserver(LogicObserver ob); - - public void deregisterObserver(LogicObserver ob); - - public void notifyObservers(); - -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObserver.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObserver.java deleted file mode 100644 index 259fe4d7..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/LogicObserver.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.mograsim.logic.core; - -@FunctionalInterface -public interface LogicObserver -{ - public void update(LogicObservable initiator); -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicCoreComponent.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicCoreComponent.java deleted file mode 100644 index c82f2b37..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicCoreComponent.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.mograsim.logic.core.components; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; - -/** - * A basic component that recomputes all outputs (with a delay), when it is updated. - * - * @author Fabian Stemmler - */ -public abstract class BasicCoreComponent extends CoreComponent implements LogicObserver -{ - private int processTime; - - /** - * - * @param processTime Amount of time this component takes to update its outputs. Must be more than 0, otherwise 1 is assumed. - * - * @author Fabian Stemmler - */ - public BasicCoreComponent(Timeline timeline, int processTime) - { - super(timeline); - this.processTime = processTime > 0 ? processTime : 1; - } - - @Override - public final void update(LogicObservable initiator) - { - update(); - } - - public void update() - { - TimelineEventHandler delayedUpdates = compute(); - if (delayedUpdates != null) - timeline.addEvent(delayedUpdates, processTime); - } - - protected abstract TimelineEventHandler compute(); -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreBitDisplay.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreBitDisplay.java deleted file mode 100644 index 345bc0ab..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreBitDisplay.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreBitDisplay extends BasicCoreComponent implements LogicObservable -{ - private Collection observers; - private final ReadEnd in; - private BitVector displayedValue; - - public CoreBitDisplay(Timeline timeline, ReadEnd in) - { - super(timeline, 1); - observers = new ArrayList<>(); - this.in = in; - in.registerObserver(this); - compute(); - } - - @Override - protected TimelineEventHandler compute() - { - BitVector newValues = in.getValues(); - return e -> - { - displayedValue = newValues; - notifyObservers(); - }; - } - - public BitVector getDisplayedValue() - { - return displayedValue; - } - - public boolean isDisplaying(Bit... values) - { - return displayedValue.equals(BitVector.of(values)); - } - - @Override - public List getAllInputs() - { - return List.of(in); - } - - @Override - public List getAllOutputs() - { - return List.of(); - } - - @Override - public void registerObserver(LogicObserver ob) - { - observers.add(ob); - } - - @Override - public void deregisterObserver(LogicObserver ob) - { - observers.remove(ob); - } - - @Override - public void notifyObservers() - { - observers.forEach(ob -> ob.update(this)); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreClock.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreClock.java deleted file mode 100644 index 0cccdfdd..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreClock.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.Collection; -import java.util.HashSet; -import java.util.List; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEvent; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreClock extends CoreComponent implements TimelineEventHandler, LogicObservable -{ - private Collection observers; - private boolean toggle = false; - private ReadWriteEnd out; - private int delta; - - /** - * - * @param out {@link CoreWire} the clock's impulses are fed into - * @param delta ticks between rising and falling edge - */ - public CoreClock(Timeline timeline, ReadWriteEnd out, int delta) - { - super(timeline); - this.delta = delta; - this.out = out; - this.observers = new HashSet<>(); - addToTimeline(); - } - - @Override - public void handle(TimelineEvent e) - { - addToTimeline(); - out.feedSignals(toggle ? Bit.ONE : Bit.ZERO); - toggle = !toggle; - notifyObservers(); - } - - public ReadWriteEnd getOut() - { - return out; - } - - public boolean isOn() - { - return !toggle; - } - - private void addToTimeline() - { - timeline.addEvent(this, delta); - } - - @Override - public List getAllInputs() - { - return List.of(); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } - - @Override - public void registerObserver(LogicObserver ob) - { - observers.add(ob); - } - - @Override - public void deregisterObserver(LogicObserver ob) - { - observers.remove(ob); - } - - @Override - public void notifyObservers() - { - observers.forEach(ob -> ob.update(this)); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreComponent.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreComponent.java deleted file mode 100644 index 734f48de..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreComponent.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.List; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public abstract class CoreComponent -{ - protected Timeline timeline; - - public CoreComponent(Timeline timeline) - { - this.timeline = timeline; - } - - /** - * Returns immutable list of all inputs to the {@link CoreComponent} (including e.g. the select bits to a MUX). Intended for - * visualization in the UI. - */ - public abstract List getAllInputs(); - - /** - * Returns immutable list of all outputs to the {@link CoreComponent}. Intended for visualization in the UI. - */ - public abstract List getAllOutputs(); -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreDemux.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreDemux.java deleted file mode 100644 index 8f4fe428..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreDemux.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.List; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -/** - * Models a multiplexer. Takes an arbitrary amount of input {@link CoreWire}s, one of which, as determined by select, is put through to the - * output. - * - * @author Fabian Stemmler - * - */ -public class CoreDemux extends BasicCoreComponent -{ - private final ReadEnd select, in; - private final ReadWriteEnd[] outputs; - private final int outputSize; - private int selected = -1; - - /** - * Output {@link CoreWire}s and in must be of uniform width - * - * @param in Must be of uniform width with all outputs. - * @param select Indexes the output array to which the input is mapped. Must have enough bits to index all outputs. - * @param outputs One of these outputs receives the input signal, depending on the select bits - */ - public CoreDemux(Timeline timeline, int processTime, ReadEnd in, ReadEnd select, ReadWriteEnd... outputs) - { - super(timeline, processTime); - outputSize = in.width(); - - this.in = in; - this.outputs = outputs; - for (int i = 0; i < this.outputs.length; i++) - { - if (outputs[i].width() != outputSize) - throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform width!"); - this.outputs[i] = outputs[i]; - } - - this.select = select; - select.registerObserver(this); - - int maxInputs = 1 << select.width(); - if (this.outputs.length > maxInputs) - throw new IllegalArgumentException("There are more outputs (" + this.outputs.length + ") to the DEMUX than supported by " - + select.width() + " select bits (" + maxInputs + ")."); - in.registerObserver(this); - } - - @Override - public TimelineEventHandler compute() - { - int selectValue = select.getValues().isBinary() ? (int) select.getValues().getUnsignedValueLong() : -1; - if (selectValue >= outputs.length) - selectValue = -1; - - boolean hasOldSelection = selected != selectValue && selected != -1; - int oldSelection = selected; - boolean hasNewSelection = selectValue != -1; - int newSelection = selectValue; - BitVector inputValues = in.getValues(); - - selected = selectValue; - - return e -> - { - if (hasOldSelection) - outputs[oldSelection].clearSignals(); - if (hasNewSelection) - outputs[newSelection].feedSignals(inputValues); - }; - } - - @Override - public List getAllInputs() - { - return List.of(in, select); - } - - @Override - public List getAllOutputs() - { - return List.of(outputs); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreManualSwitch.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreManualSwitch.java deleted file mode 100644 index b7e5d3a6..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreManualSwitch.java +++ /dev/null @@ -1,109 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -/** - * This class models a simple on/off (ONE/ZERO) switch for user interaction. - * - * @author Christian Femers - * - */ -public class CoreManualSwitch extends CoreComponent implements LogicObservable -{ - private Collection observers; - private ReadWriteEnd output; - private BitVector inputValues; - - public CoreManualSwitch(Timeline timeline, ReadWriteEnd output) - { - super(timeline); - observers = new ArrayList<>(); - this.output = output; - this.inputValues = output.getInputValues(); - } - - public void switchFullOn() - { - setState(BitVector.of(Bit.ONE, output.width())); - } - - public void switchFullOff() - { - setState(BitVector.of(Bit.ZERO, output.width())); - } - - public void toggle() - { - if (isFullOn()) - switchFullOff(); - else - switchFullOn(); - } - - public void setState(Bit bit) - { - setState(BitVector.of(bit)); - } - - public void setState(BitVector bits) - { - if (bits.length() != output.width()) - throw new IllegalArgumentException("Incorrect bit vector length"); - if (bits.equals(inputValues)) - return; - inputValues = bits; - output.feedSignals(bits); - notifyObservers(); - } - - public boolean isFullOn() - { - return BitVector.of(Bit.ONE, output.width()).equals(output.getInputValues()); - } - - public BitVector getValues() - { - return inputValues; - } - - @Override - public List getAllInputs() - { - return List.of(); - } - - @Override - public List getAllOutputs() - { - return List.of(output); - } - - @Override - public void registerObserver(LogicObserver ob) - { - observers.add(ob); - } - - @Override - public void deregisterObserver(LogicObserver ob) - { - observers.remove(ob); - } - - @Override - public void notifyObservers() - { - observers.forEach(ob -> ob.update(this)); - } - -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreMux.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreMux.java deleted file mode 100644 index 5b4220a5..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreMux.java +++ /dev/null @@ -1,96 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -/** - * Models a multiplexer. Takes an arbitrary amount of input {@link CoreWire}s, one of which, as determined by select, is put through to the - * output. - * - * @author Fabian Stemmler - * - */ -public class CoreMux extends BasicCoreComponent -{ - private ReadEnd select; - private ReadWriteEnd out; - private ReadEnd[] inputs; - private final int outputSize; - - /** - * Input {@link CoreWire}s and out must be of uniform width - * - * @param out Must be of uniform width with all inputs. - * @param select Indexes the input array which is to be mapped to the output. Must have enough bits to index all inputs. - * @param inputs One of these inputs is mapped to the output, depending on the select bits - */ - public CoreMux(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd select, ReadEnd... inputs) - { - super(timeline, processTime); - outputSize = out.width(); - - this.inputs = inputs.clone(); - for (int i = 0; i < this.inputs.length; i++) - { - if (inputs[i].width() != outputSize) - throw new IllegalArgumentException("All MUX wire arrays must be of uniform width!"); - inputs[i].registerObserver(this); - } - - this.select = select; - select.registerObserver(this); - - int maxInputs = 1 << select.width(); - if (this.inputs.length > maxInputs) - throw new IllegalArgumentException("There are more inputs (" + this.inputs.length + ") to the MUX than supported by " - + select.width() + " select bits (" + maxInputs + ")."); - - this.out = out; - } - - public ReadEnd getOut() - { - return out; - } - - public ReadEnd getSelect() - { - return select; - } - - @Override - public TimelineEventHandler compute() - { - int selectValue; - if (!select.getValues().isBinary() || (selectValue = (int) select.getValues().getUnsignedValueLong()) >= inputs.length) - { - return e -> out.clearSignals(); - } - - BitVector activeValues = inputs[selectValue].getValues(); - return e -> out.feedSignals(activeValues); - } - - @Override - public List getAllInputs() - { - ArrayList wires = new ArrayList<>(Arrays.asList(inputs)); - wires.add(select); - return Collections.unmodifiableList(wires); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreTriStateBuffer.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreTriStateBuffer.java deleted file mode 100644 index 4b7a339f..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreTriStateBuffer.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.List; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreTriStateBuffer extends BasicCoreComponent -{ - ReadEnd in, enable; - ReadWriteEnd out; - - public CoreTriStateBuffer(Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd out, ReadEnd enable) - { - super(timeline, processTime); - if (in.width() != out.width()) - throw new IllegalArgumentException( - "Tri-state output must have the same amount of bits as the input. Input: " + in.width() + " Output: " + out.width()); - if (enable.width() != 1) - throw new IllegalArgumentException("Tri-state enable must have exactly one bit, not " + enable.width() + "."); - this.in = in; - in.registerObserver(this); - this.enable = enable; - enable.registerObserver(this); - this.out = out; - } - - @Override - protected TimelineEventHandler compute() - { - if (enable.getValue() == Bit.ONE) - { - BitVector inValues = in.getValues(); - return e -> out.feedSignals(inValues); - } - return e -> out.clearSignals(); - } - - @Override - public List getAllInputs() - { - return List.of(in, enable); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } - -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalMerger.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalMerger.java deleted file mode 100644 index 6e6b0f15..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalMerger.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.List; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreUnidirectionalMerger extends CoreComponent implements LogicObserver -{ - private ReadWriteEnd out; - private ReadEnd[] inputs; - private int[] beginningIndex; - - /** - * - * @param union The output of merging n {@link CoreWire}s into one. Must have width = a1.width() + a2.width() + ... + an.width(). - * @param inputs The inputs to be merged into the union - */ - public CoreUnidirectionalMerger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs) - { - super(timeline); - this.inputs = inputs; - this.out = union; - this.beginningIndex = new int[inputs.length]; - - int width = 0; - for (int i = 0; i < inputs.length; i++) - { - beginningIndex[i] = width; - width += inputs[i].width(); - inputs[i].registerObserver(this); - } - - if (width != union.width()) - throw new IllegalArgumentException( - "The output of merging n WireArrays into one must have width = a1.width() + a2.width() + ... + an.width()."); - } - - public ReadEnd getInput(int index) - { - return inputs[index]; - } - - public ReadEnd getUnion() - { - return out; - } - - @Override - public void update(LogicObservable initiator) - { - int index = find(initiator); - int beginning = beginningIndex[index]; - out.feedSignals(beginning, inputs[index].getValues()); - } - - private int find(LogicObservable r) - { - for (int i = 0; i < inputs.length; i++) - if (inputs[i] == r) - return i; - return -1; - } - - public ReadEnd[] getInputs() - { - return inputs.clone(); - } - - @Override - public List getAllInputs() - { - return List.of(inputs); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalSplitter.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalSplitter.java deleted file mode 100644 index d77e1541..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/CoreUnidirectionalSplitter.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.mograsim.logic.core.components; - -import java.util.List; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreUnidirectionalSplitter extends CoreComponent implements LogicObserver -{ - private ReadEnd input; - private ReadWriteEnd[] outputs; - - public CoreUnidirectionalSplitter(Timeline timeline, ReadEnd input, ReadWriteEnd... outputs) - { - super(timeline); - this.input = input; - this.outputs = outputs; - input.registerObserver(this); - int width = 0; - for (ReadEnd out : outputs) - width += out.width(); - - if (input.width() != width) - throw new IllegalArgumentException( - "The input of splitting one into n WireArrays must have width = a1.width() + a2.width() + ... + an.width()."); - } - - protected void compute() - { - BitVector inputBits = input.getValues(); - int startIndex = 0; - for (int i = 0; i < outputs.length; i++) - { - outputs[i].feedSignals(inputBits.subVector(startIndex, startIndex + outputs[i].width())); - startIndex += outputs[i].width(); - } - } - - @Override - public void update(LogicObservable initiator) - { - compute(); - } - - @Override - public List getAllInputs() - { - return List.of(input); - } - - @Override - public List getAllOutputs() - { - return List.of(outputs); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreAndGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreAndGate.java deleted file mode 100644 index d71e08e1..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreAndGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreAndGate extends MultiInputCoreGate -{ - public CoreAndGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::and, out, in); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNandGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNandGate.java deleted file mode 100644 index e847d0ec..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNandGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreNandGate extends MultiInputCoreGate -{ - public CoreNandGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::and, true, out, in); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNorGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNorGate.java deleted file mode 100644 index 12336274..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNorGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreNorGate extends MultiInputCoreGate -{ - public CoreNorGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::or, true, out, in); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNotGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNotGate.java deleted file mode 100644 index b7808be9..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreNotGate.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import java.util.List; - -import net.mograsim.logic.core.components.BasicCoreComponent; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreNotGate extends BasicCoreComponent -{ - private ReadEnd in; - private ReadWriteEnd out; - - public CoreNotGate(Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd out) - { - super(timeline, processTime); - this.in = in; - in.registerObserver(this); - this.out = out; - } - - @Override - protected TimelineEventHandler compute() - { - BitVector values = in.getValues().not(); - return e -> out.feedSignals(values); - } - - public ReadEnd getIn() - { - return in; - } - - public ReadEnd getOut() - { - return out; - } - - @Override - public List getAllInputs() - { - return List.of(in); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreOrGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreOrGate.java deleted file mode 100644 index 97d75c80..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreOrGate.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public class CoreOrGate extends MultiInputCoreGate -{ - public CoreOrGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::or, out, in); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreXorGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreXorGate.java deleted file mode 100644 index 8bc98934..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/CoreXorGate.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -/** - * Outputs 1 when the number of 1 inputs is odd. - * - * @author Fabian Stemmler - */ -public class CoreXorGate extends MultiInputCoreGate -{ - public CoreXorGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime, BitVectorMutator::xor, out, in); - } - -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputCoreGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputCoreGate.java deleted file mode 100644 index 010ae74f..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputCoreGate.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.mograsim.logic.core.components.gates; - -import java.util.List; - -import net.mograsim.logic.core.components.BasicCoreComponent; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; -import net.mograsim.logic.core.types.MutationOperation; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -public abstract class MultiInputCoreGate extends BasicCoreComponent -{ - protected ReadEnd[] in; - protected ReadWriteEnd out; - protected final int width; - protected MutationOperation op; - protected boolean invert = false; - - protected MultiInputCoreGate(Timeline timeline, int processTime, MutationOperation op, ReadWriteEnd out, ReadEnd... in) - { - super(timeline, processTime); - this.op = op; - width = out.width(); - this.in = in.clone(); - if (in.length < 1) - throw new IllegalArgumentException(String.format("Cannot create gate with %d wires.", in.length)); - for (ReadEnd w : in) - { - if (w.width() != width) - throw new IllegalArgumentException("All wires connected to the gate must be of uniform length."); - w.registerObserver(this); - } - this.out = out; - } - - protected MultiInputCoreGate(Timeline timeline, int processTime, MutationOperation op, boolean invert, ReadWriteEnd out, ReadEnd... in) - { - this(timeline, processTime, op, out, in); - this.invert = invert; - } - - @Override - public List getAllInputs() - { - return List.of(in); - } - - @Override - public List getAllOutputs() - { - return List.of(out); - } - - @Override - public TimelineEventHandler compute() - { - BitVectorMutator mutator = BitVectorMutator.empty(); - for (ReadEnd w : in) - op.apply(mutator, w.getValues()); - return e -> out.feedSignals(invert ? mutator.toBitVector().not() : mutator.toBitVector()); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java deleted file mode 100644 index 9dbc31d4..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java +++ /dev/null @@ -1,256 +0,0 @@ -package net.mograsim.logic.core.timeline; - -import java.util.ArrayList; -import java.util.List; -import java.util.PriorityQueue; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; -import java.util.function.LongSupplier; - -/** - * Orders Events by the time they are due to be executed. Can execute Events individually. - * - * @author Fabian Stemmler - * - */ -public class Timeline -{ - private PriorityQueue events; - private LongSupplier time; - private long lastTimeUpdated = 0; - private long eventCounter = 0; - - private final List> eventAddedListener; - - public final LongSupplier stepByStepExec = () -> lastTimeUpdated; - public final LongSupplier realTimeExec = () -> System.currentTimeMillis(); - - /** - * Constructs a Timeline object. Per default the time function is set to step by step execution. - * - * @param initCapacity The initial capacity of the event queue. - */ - public Timeline(int initCapacity) - { - events = new PriorityQueue<>(initCapacity); - eventAddedListener = new ArrayList<>(); - time = stepByStepExec; - } - - /** - * @param timestamp exclusive - * @return true if the first event in queue is later than the given timestamp - */ - public BooleanSupplier laterThan(long timestamp) - { - return () -> timeCmp(events.peek().getTiming(), timestamp) > 0; - } - - /** - * @return true if there is at least one event enqueued. false otherwise - */ - public boolean hasNext() - { - return !events.isEmpty(); - } - - /** - * Executes all events at the next timestamp, at which there are any - */ - public void executeNext() - { - InnerEvent first = events.peek(); - if (first != null) - executeUntil(laterThan(first.getTiming()), -1); - } - - /** - * Executes all events enqueued in the {@link Timeline}. Use very carefully! Events may generate new events, causing an infinite loop. - */ - public void executeAll() - { - while (hasNext()) - executeNext(); - } - - /** - * Executes all events until a given condition is met. The simulation process can be constrained by a real world timestamp. - * - * @param condition the condition until which the events are be processed - * @param stopMillis the System.currentTimeMillis() when simulation definitely needs to stop. A value of -1 means no timeout. - * @return State of the event execution - * @formatter:off - * NOTHING_DONE if the {@link Timeline} was already empty - * EXEC_OUT_OF_TIME if the given maximum time was reached - * EXEC_UNTIL_CONDITION if the condition was met - * EXEC_UNTIL_EMPTY if events were executed until the {@link Timeline} was empty - * @formatter:on - */ - public ExecutionResult executeUntil(BooleanSupplier condition, long stopMillis) - { - if (events.isEmpty()) - { - lastTimeUpdated = getSimulationTime(); - return ExecutionResult.NOTHING_DONE; - } - int checkStop = 0; - while (hasNext() && !condition.getAsBoolean()) - { - InnerEvent event; - synchronized (events) - { - event = events.remove(); - } - lastTimeUpdated = event.getTiming(); - event.run(); - // Don't check after every run - checkStop = (checkStop + 1) % 10; - if (checkStop == 0 && System.currentTimeMillis() >= stopMillis) - return ExecutionResult.EXEC_OUT_OF_TIME; - } - lastTimeUpdated = getSimulationTime(); - return hasNext() ? ExecutionResult.EXEC_UNTIL_EMPTY : ExecutionResult.EXEC_UNTIL_CONDITION; - } - - /** - * Sets the function, which defines the current simulation time at any time. - * - * @param time The return value of calling this function is the current simulation time. - */ - public void setTimeFunction(LongSupplier time) - { - this.time = time; - } - - /** - * Calculates the current simulation time. - * - * @return The simulation time as defined by the time function. - */ - public long getSimulationTime() - { - return time.getAsLong(); - } - - /** - * Retrieves the timestamp of the next event. - * - * @return The timestamp of the next enqueued event, if the {@link Timeline} is not empty, -1 otherwise. - */ - public long nextEventTime() - { - if (!hasNext()) - return -1; - return events.peek().getTiming(); - } - - /** - * Clears the {@link Timeline} of enqueued events. - */ - public void reset() - { - synchronized (events) - { - events.clear(); - } - lastTimeUpdated = 0; - } - - /** - * Adds a listener, that is called when a {@link TimelineEvent} is added. - */ - public void addEventAddedListener(Consumer listener) - { - eventAddedListener.add(listener); - } - - /** - * Removes the listener, if possible. It will no longer be called when a {@link TimelineEvent} is added. - */ - public void removeEventAddedListener(Consumer listener) - { - eventAddedListener.remove(listener); - } - - /** - * Adds an Event to the {@link Timeline} - * - * @param function The {@link TimelineEventHandler} that will be executed, when the {@link InnerEvent} occurs on the timeline. - * @param relativeTiming The amount of MI ticks in which the {@link InnerEvent} is called, starting from the current time. - */ - public void addEvent(TimelineEventHandler function, int relativeTiming) - { - long timing = getSimulationTime() + relativeTiming; - TimelineEvent event = new TimelineEvent(timing); - synchronized (events) - { - events.add(new InnerEvent(function, event, eventCounter++)); - } - eventAddedListener.forEach(l -> l.accept(event)); - } - - private class InnerEvent implements Runnable, Comparable - { - private final TimelineEventHandler function; - private final TimelineEvent event; - private final long id; - - /** - * Creates an {@link InnerEvent} - * - * @param function {@link TimelineEventHandler} to be executed when the {@link InnerEvent} occurs - * @param timing Point in the MI simulation {@link Timeline}, at which the {@link InnerEvent} is executed; - */ - InnerEvent(TimelineEventHandler function, TimelineEvent event, long id) - { - this.function = function; - this.event = event; - this.id = id; - } - - public long getTiming() - { - return event.getTiming(); - } - - @Override - public void run() - { - function.handle(event); - } - - @Override - public String toString() - { - return event.toString(); - } - - @Override - public int compareTo(InnerEvent o) - { - int c1; - return (c1 = timeCmp(getTiming(), o.getTiming())) == 0 ? timeCmp(id, o.id) : c1; - } - } - - public static int timeCmp(long a, long b) - { - return Long.signum(a - b); - } - - @Override - public String toString() - { - String eventsString; - synchronized (events) - { - eventsString = events.toString(); - } - return String.format("Simulation time: %s, Last update: %d, Events: %s", getSimulationTime(), lastTimeUpdated, eventsString); - } - - public enum ExecutionResult - { - NOTHING_DONE, EXEC_UNTIL_EMPTY, EXEC_UNTIL_CONDITION, EXEC_OUT_OF_TIME - } -} \ No newline at end of file diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEvent.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEvent.java deleted file mode 100644 index c46e6ad6..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.mograsim.logic.core.timeline; - -/** - * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to - * store. - * - * @author Fabian Stemmler - * - */ -public class TimelineEvent -{ - private final long timing; - - TimelineEvent(long timing) - { - super(); - this.timing = timing; - } - - public long getTiming() - { - return timing; - } - - @Override - public String toString() - { - return "timestamp: " + timing; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java deleted file mode 100644 index badbabcb..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.mograsim.logic.core.timeline; - -@FunctionalInterface -public interface TimelineEventHandler -{ - public void handle(TimelineEvent e); -} \ No newline at end of file diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/Bit.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/Bit.java deleted file mode 100644 index 752fbb80..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/Bit.java +++ /dev/null @@ -1,181 +0,0 @@ -package net.mograsim.logic.core.types; - -import java.util.Arrays; -import java.util.Map; -import java.util.Objects; - -/** - * stdlogic according to IEEE 1164 - */ -public enum Bit implements StrictLogicType -{ - U("U"), X("X"), ZERO("0"), ONE("1"), Z("Z"); - - private final String symbol; - - private Bit(String symbol) - { - this.symbol = symbol; - } - - /** - * Returns if the Bit is binary, this is only true for ZERO and ONE. - * - * @return true if and only if this == ONE || this == ZERO - */ - public boolean isBinary() - { - return this == ONE || this == ZERO; - } - - @Override - public Bit and(Bit other) - { - return fromTable(AND_TABLE, this, other); - } - - public static void and(Bit[] dst, Bit[] src) - { - for (int i = 0; i < dst.length; i++) - dst[i] = dst[i].and(src[i]); - } - - @Override - public Bit or(Bit other) - { - return fromTable(OR_TABLE, this, other); - } - - public static void or(Bit[] dst, Bit[] src) - { - for (int i = 0; i < dst.length; i++) - dst[i] = dst[i].or(src[i]); - } - - @Override - public Bit xor(Bit other) - { - return fromTable(XOR_TABLE, this, other); - } - - public static void xor(Bit[] dst, Bit[] src) - { - for (int i = 0; i < dst.length; i++) - dst[i] = dst[i].xor(src[i]); - } - - @Override - public Bit not() - { - switch (this) - { - case U: - return U; - case ONE: - return ZERO; - case ZERO: - return ONE; - default: - return X; - } - } - - public Bit[] makeArray(int length) - { - Bit[] bits = new Bit[length]; - Arrays.fill(bits, this); - return bits; - } - - public BitVector toVector() - { - return BitVector.of(this, 1); - } - - public BitVector toVector(int length) - { - return BitVector.of(this, length); - } - - @Override - public Bit join(Bit other) - { - return fromTable(JOIN_TABLE, this, other); - } - - public static void join(Bit[] dst, Bit[] src) - { - for (int i = 0; i < dst.length; i++) - dst[i] = dst[i].join(src[i]); - } - - @Override - public String toString() - { - return getSymbol(); - } - - public String getSymbol() - { - return symbol; - } - - public static Bit lastBitOf(int value) - { - return values()[2 + (value & 1)]; - } - - public static Bit of(boolean binaryValue) - { - return binaryValue ? ONE : ZERO; - } - - public static Bit parse(String s) - { - Bit bit = SYMBOL_MAP.get(s); - Objects.requireNonNull(bit, "No Bit found for symbol " + s); - return bit; - } - - public static Bit parse(String s, int symbolPosition) - { - return parse(s.substring(symbolPosition, symbolPosition + 1)); - } - - private static Bit fromTable(Bit[][] table, Bit a, Bit b) - { - return table[a.ordinal()][b.ordinal()]; - } - - static final Map SYMBOL_MAP = Map.of(U.symbol, U, X.symbol, X, ZERO.symbol, ZERO, ONE.symbol, ONE, Z.symbol, Z); - - // @formatter:off - private static final Bit[][] JOIN_TABLE = - { { U, U, U, U, U }, - { U, X, X, X, X }, - { U, X, ZERO, X, ZERO }, - { U, X, X, ONE, ONE }, - { U, X, ZERO, ONE, Z } }; - - private static final Bit[][] AND_TABLE = - { { U, U, ZERO, U, U }, - { U, X, ZERO, X, X }, - { ZERO, ZERO, ZERO, ZERO, ZERO }, - { U, X, ZERO, ONE, X }, - { U, X, ZERO, X, X } }; - - private static final Bit[][] OR_TABLE = - { { U, U, U, ONE, U }, - { U, X, X, ONE, X }, - { U, X, ZERO, ONE, X }, - { ONE, ONE, ONE, ONE, ONE }, - { U, X, X, ONE, X } }; - - private static final Bit[][] XOR_TABLE = - { { U, U, U, U, U }, - { U, X, X, X, X }, - { U, X, ZERO, ONE, X }, - { U, X, ONE, ZERO, X }, - { U, X, X, X, X } }; - // @formatter:on -} \ No newline at end of file diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java deleted file mode 100644 index 13466949..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java +++ /dev/null @@ -1,530 +0,0 @@ -package net.mograsim.logic.core.types; - -import static java.lang.String.format; - -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.Objects; -import java.util.RandomAccess; -import java.util.function.BinaryOperator; -import java.util.function.UnaryOperator; - -/** - * Immutable class representing a {@link Bit}Vector - * - * @author Christian Femers - * - */ -public final class BitVector implements StrictLogicType, Iterable, RandomAccess -{ - public static final BitVector SINGLE_U = new BitVector(Bit.U); - public static final BitVector SINGLE_X = new BitVector(Bit.X); - public static final BitVector SINGLE_0 = new BitVector(Bit.ZERO); - public static final BitVector SINGLE_1 = new BitVector(Bit.ONE); - public static final BitVector SINGLE_Z = new BitVector(Bit.Z); - - private static final BitVector[] SINGLE_BIT_MAPPING = { SINGLE_U, SINGLE_X, SINGLE_0, SINGLE_1, SINGLE_Z }; - - private final Bit[] bits; - - private BitVector(Bit single) - { - Objects.requireNonNull(single); - bits = new Bit[] { single }; - } - - private BitVector(Bit[] bits) - { - this.bits = Objects.requireNonNull(bits); // do this first to "catch" bits==null before the foreach loop - for (Bit bit : bits) - if (bit == null) - throw new NullPointerException(); - } - - public static BitVector of(Bit... bits) - { - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].ordinal()]; - return new BitVector(bits.clone()); - } - - public static BitVector of(Bit bit, int length) - { - if (length == 1) - return SINGLE_BIT_MAPPING[bit.ordinal()]; - return new BitVector(bit.makeArray(length)); - } - - public static BitVector from(long value, int bits) - { - return from(BigInteger.valueOf(value), bits); - } - - public static BitVector from(BigInteger value, int bits) - { - Bit[] values = new Bit[bits]; - for (int i = 0; i < bits; i++) - values[bits - i - 1] = Bit.of(value.testBit(i)); - return new BitVector(values); - } - - public BitVectorMutator mutator() - { - return BitVectorMutator.of(this); - } - - /** - * Returns the most significant bit at bitIndex. (leftmost bit of a binary number at the given index) - */ - public Bit getMSBit(int bitIndex) - { - return bits[bitIndex]; - } - - /** - * Returns the least significant bit at bitIndex. (rightmost bit of a binary number at the given index) - */ - public Bit getLSBit(int bitIndex) - { - return bits[bits.length - bitIndex - 1]; - } - - public Bit[] getBits() - { - return bits.clone(); - } - - /** - * Checks if all bits are {@link Bit#isBinary() binary}. - * - * @see Bit#isBinary() - */ - public boolean isBinary() - { - for (int i = 0; i < bits.length; i++) - { - if (!bits[i].isBinary()) - return false; - } - return true; - } - - @Override - public BitVector join(BitVector t) - { - checkCompatibility(t); - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].join(t.bits[0]).ordinal()]; - return new BitVector(binOp(bits.clone(), t.bits, Bit::join)); - } - - @Override - public BitVector and(BitVector t) - { - checkCompatibility(t); - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].and(t.bits[0]).ordinal()]; - return new BitVector(binOp(bits.clone(), t.bits, Bit::and)); - } - - @Override - public BitVector or(BitVector t) - { - checkCompatibility(t); - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].or(t.bits[0]).ordinal()]; - return new BitVector(binOp(bits.clone(), t.bits, Bit::or)); - } - - @Override - public BitVector xor(BitVector t) - { - checkCompatibility(t); - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].xor(t.bits[0]).ordinal()]; - return new BitVector(binOp(bits.clone(), t.bits, Bit::xor)); - } - - @Override - public BitVector not() - { - if (bits.length == 1) - return SINGLE_BIT_MAPPING[bits[0].not().ordinal()]; - return new BitVector(unOp(bits.clone(), Bit::not)); - } - - public int length() - { - return bits.length; - } - - public BitVector concat(BitVector other) - { - Bit[] newBits = Arrays.copyOf(bits, length() + other.length()); - System.arraycopy(other.bits, 0, newBits, length(), other.length()); - return new BitVector(newBits); - } - - public BitVector subVector(int start) - { - return new BitVector(Arrays.copyOfRange(bits, start, length())); - } - - public BitVector subVector(int start, int end) - { - return new BitVector(Arrays.copyOfRange(bits, start, end)); - } - - private void checkCompatibility(BitVector bv) - { - if (length() != bv.length()) - throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", length(), bv.length())); - } - - static Bit[] binOp(Bit[] dest, Bit[] second, BinaryOperator op) - { - if (dest == null) - return second.clone(); - for (int i = 0; i < dest.length; i++) - { - dest[i] = op.apply(dest[i], second[i]); - } - return dest; - } - - static Bit[] unOp(Bit[] dest, UnaryOperator op) - { - if (dest == null) - return null; - for (int i = 0; i < dest.length; i++) - { - dest[i] = op.apply(dest[i]); - } - return dest; - } - - /** - * Class for comfortable and efficient manipulation of {@link BitVector}s, similar to {@link StringBuilder} - * - * @author Christian Femers - */ - public static final class BitVectorMutator implements LogicType - { - private Bit[] bits; - - private BitVectorMutator(Bit[] bits) - { - this.bits = bits; - } - - static BitVectorMutator of(BitVector bv) - { - return new BitVectorMutator(bv.getBits()); - } - - /** - * Returns a new mutator of the specified length, with all bits set to null. Use with care! - */ - public static BitVectorMutator ofLength(int length) - { - return new BitVectorMutator(new Bit[length]); - } - - /** - * Returns an empty mutator which has no bits set and will simply copy the values from the first binary operation performed. - *

- * An empty BitVectorMutator must not be converted to BitVector or used to manipulate single bits until at least one two - * operand logic operation is performed. - */ - public static BitVectorMutator empty() - { - return new BitVectorMutator(null); - } - - /** - * @see #empty() - */ - public boolean isEmpty() - { - return bits == null; - } - - /** - * Produces the resulting, immutable {@link BitVector}
- * - * @throws IllegalStateException if the mutator is (still) empty - */ - public BitVector toBitVector() - { - if (bits == null) - throw new IllegalStateException("cannot create a BitVector from an empty mutator"); - return new BitVector(bits); - } - - @Override - public BitVectorMutator join(BitVector t) - { - checkCompatibility(t); - bits = binOp(bits, t.bits, Bit::join); - return this; - } - - @Override - public BitVectorMutator and(BitVector t) - { - checkCompatibility(t); - bits = binOp(bits, t.bits, Bit::and); - return this; - } - - @Override - public BitVectorMutator or(BitVector t) - { - checkCompatibility(t); - bits = binOp(bits, t.bits, Bit::or); - return this; - } - - @Override - public BitVectorMutator xor(BitVector t) - { - checkCompatibility(t); - bits = binOp(bits, t.bits, Bit::xor); - return this; - } - - @Override - public BitVectorMutator not() - { - unOp(bits, Bit::not); - return this; - } - - /** - * Set the most significant bit at bitIndex. (leftmost bit of a binary number at the given index) - */ - public void setMSBit(int bitIndex, Bit bit) - { - if (bits == null) - throw new IllegalStateException("cannot set a bit of an empty mutator"); - bits[bitIndex] = bit; - } - - /** - * Set the least significant bit at bitIndex. (rightmost bit of a binary number at the given index) - */ - public void setLSBit(int bitIndex, Bit bit) - { - if (bits == null) - throw new IllegalStateException("cannot set a bit of an empty mutator"); - bits[bits.length - bitIndex - 1] = bit; - } - - /** - * Returns the most significant bit at bitIndex. (leftmost bit of a binary number at the given index) - */ - public Bit getMSBit(int bitIndex) - { - if (bits == null) - throw new IllegalStateException("cannot get a bit of an empty mutator"); - return bits[bitIndex]; - } - - /** - * Returns the least significant bit at bitIndex. (rightmost bit of a binary number at the given index) - */ - public Bit getLSBit(int bitIndex) - { - if (bits == null) - throw new IllegalStateException("cannot get a bit of an empty mutator"); - return bits[bits.length - bitIndex - 1]; - } - - public int length() - { - if (bits == null) - throw new IllegalStateException("cannot obtain a length of an empty mutator"); - return bits.length; - } - - private void checkCompatibility(BitVector bv) - { - if (bits != null && bits.length != bv.length()) - throw new IllegalArgumentException(format("BitVector length does not match: %d and %d", bits.length, bv.length())); - } - } - - /** - * @see Arrays#hashCode(Object[]) - */ - @Override - public int hashCode() - { - return Arrays.hashCode(bits); - } - - /** - * Does test for equality of values/content - * - * @see Object#equals(Object) - */ - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (!(obj instanceof BitVector)) - return false; - BitVector other = (BitVector) obj; - return Arrays.equals(bits, other.bits); - } - - /** - * Does test for equality of values/content, shifting the other BitVector by offset to the right.
- * Therefore offset + other.length() <= this.wdith() needs to be true. - * - * @throws ArrayIndexOutOfBoundsException if offset + other.length() > this.length() - * - * @see Object#equals(Object) - */ - public boolean equalsWithOffset(BitVector other, int offset) - { - if (other == null) - return false; - return Arrays.equals(bits, offset, offset + other.length(), other.bits, 0, other.length()); - } - - /** - * All {@link Bit}s symbols concatenated together (MSB first) - * - * @see #parse(String) - */ - @Override - public String toString() - { - StringBuilder sb = new StringBuilder(bits.length); - for (Bit bit : bits) - sb.append(bit); - return sb.toString(); - } - - /** - * Returns the value of the BitVector as BigInteger. - * - * @throws NumberFormatException if the BitVector is not {@link #isBinary() binary}. - */ - public BigInteger getUnsignedValue() - { - if (!isBinary()) - throw new NumberFormatException(this + " is not binary"); - byte[] bytes = new byte[(bits.length / 8 + (bits.length % 8 == 0 ? 0 : 1)) + 1]; - for (int i = bits.length - 1; i >= 0; i--) - { - if (Bit.ONE == bits[bits.length - i - 1]) - { - try - { - bytes[bytes.length - (i / 8) - 1] |= 1 << (i % 8); - } - catch (IndexOutOfBoundsException e) - { - e.printStackTrace(); - } - } - } - return new BigInteger(bytes); - } - - public long getUnsignedValueLong() - { - return getUnsignedValue().longValue(); - } - - /** - * Returns the value of the BitVector as BigInteger interpreted as a two's complement number. - * - * @throws NumberFormatException if the BitVector is not {@link #isBinary() binary}. - * - * @author Daniel Kirschten - */ - public BigInteger getSignedValue() - { - BigInteger unsignedValue = getUnsignedValue(); - if (bits[bits.length - 1] == Bit.ZERO) - return unsignedValue; - return unsignedValue.subtract(BitVector.of(Bit.ONE, bits.length).getUnsignedValue()).subtract(BigInteger.ONE);// TODO speed this up! - } - - public long getSignedValueLong() - { - return getSignedValue().longValue(); - } - - /** - * Parses a String containing solely {@link Bit} symbols (MSB first) - * - * @see #toString() - */ - public static BitVector parse(String s) - { - Bit[] values = new Bit[s.length()]; - for (int i = 0; i < s.length(); i++) - { - values[i] = Bit.parse(s, i); - } - return new BitVector(values); - } - - /** - * Changes a single Bit using the given operation. This can be used to set, clear or flip bits. - * - * @param msbIndex index of the MSB to be changed - * @param singleBitOperation the operation to perform on that Bit - * @return the resulting, new BitVektor - */ - public BitVector withBitChanged(int msbIndex, UnaryOperator singleBitOperation) - { - Bit[] newBits = bits.clone(); - newBits[msbIndex] = singleBitOperation.apply(newBits[msbIndex]); - return new BitVector(newBits); - } - - /** - * Iterate over the {@link Bit}s of the BitVector from MSB to LSB (left to right). - */ - @Override - public Iterator iterator() - { - return new Iterator<>() - { - private int pos = 0; - - @Override - public Bit next() - { - if (!hasNext()) - throw new NoSuchElementException(); - return getMSBit(pos++); - } - - @Override - public boolean hasNext() - { - return pos != length(); - } - }; - } - - public BitVector reverse() - { - int length = length(); - Bit[] other = new Bit[length]; - for (int i = 0, j = length - 1; i < length; i++, j--) - { - other[i] = bits[j]; - } - return new BitVector(other); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java deleted file mode 100644 index 5f645a2e..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.mograsim.logic.core.types; - -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.preferences.ColorDefinition; -import net.mograsim.preferences.ColorDefinition.BuiltInColor; -import net.mograsim.preferences.Preferences; - -public class BitVectorFormatter -{ - public static String formatValueAsString(ReadEnd end) - { - return formatAsString(end == null ? null : end.getValues()); - } - - public static String formatAsString(BitVector bitVector) - { - if (bitVector == null) - return "null"; - return bitVector.toString(); - } - - // TODO doesn't this belong to logic.model? - public static ColorDefinition formatAsColor(ReadEnd end) - { - return formatAsColor(end == null ? null : end.getValues()); - } - - public static ColorDefinition formatAsColor(BitVector bitVector) - { - // TODO maybe find a color assignment for multiple-bit bit vectors? - if (bitVector == null || bitVector.length() != 1) - return new ColorDefinition(BuiltInColor.COLOR_BLACK); - switch (bitVector.getLSBit(0)) - { - case ONE: - return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.one"); - case U: - return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.u"); - case X: - return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.x"); - case Z: - return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.z"); - case ZERO: - return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.zero"); - default: - throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0)); - } - } - - private BitVectorFormatter() - { - throw new UnsupportedOperationException("No BitVectorFormatter instances"); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/LogicType.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/LogicType.java deleted file mode 100644 index 39ae6816..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/LogicType.java +++ /dev/null @@ -1,130 +0,0 @@ -package net.mograsim.logic.core.types; - -/** - * Interface for types that support the basic logic operations - * - * @author Christian Femers - * - * @param the logic type itself, to make the operations closed in T - * @param the operand type, may be the same as T, see {@link StrictLogicType} - */ -public interface LogicType, S> -{ - /** - * Determines the result when two signals meet each other directly, also called resolution (IEEE 1164) - * - * For example: - * - *

-	 * 0 joined 0 == 0
-	 * 1 joined 0 == X
-	 * 0 joined 1 == X
-	 * 1 joined 1 == 1
-	 *

- * - * @param t the second logic signal - * @return the resulting value - * @author Christian Femers - */ - T join(S t); - - /** - * Classical logic AND - * - * For example: - * - *
- * 0 AND 0 == 0 - * 1 AND 0 == 0 - * 0 AND 1 == 0 - * 1 AND 1 == 1 - *
- * - * @param t the second logic signal - * @return the resulting value - * @author Christian Femers - */ - T and(S t); - - /** - * Classical logic OR - * - * For example: - * - *
- * 0 OR 0 == 0 - * 1 OR 0 == 1 - * 0 OR 1 == 1 - * 1 OR 1 == 1 - *
- * - * @param t the second logic signal - * @return the resulting value - * @author Christian Femers - */ - T or(S t); - - /** - * Classical logic XOR (exclusive OR) - * - * For example: - * - *
- * 0 XOR 0 == 0 - * 1 XOR 0 == 1 - * 0 XOR 1 == 1 - * 1 XOR 1 == 0 - *
- * - * @param t the second logic signal - * @return the resulting value - * @author Christian Femers - */ - T xor(S t); - - /** - * Classical logic NOT (logical negation) - * - * For example: - * - *
- * NOT 0 == 1 - * NOT 1 == 0 - *
- * - * @return the resulting value - * @author Christian Femers - */ - T not(); - - /** - * {@link #and(Object) AND} and then {@link #not() NOT} - * - * @author Christian Femers - */ - default T nand(S t) - { - return and(t).not(); - } - - /** - * {@link #or(Object) OR} and then {@link #not() NOT} - * - * @author Christian Femers - */ - default T nor(S t) - { - return or(t).not(); - } - - /** - * {@link #xor(Object) XOR} and then {@link #not() NOT}
- * Used to determine equality (alias parity, consistency) - * - * @author Christian Femers - */ - default T xnor(S t) - { - return xor(t).not(); - } -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/MutationOperation.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/MutationOperation.java deleted file mode 100644 index 1fdae21c..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/MutationOperation.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.mograsim.logic.core.types; - -import java.util.function.BiFunction; - -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; - -@FunctionalInterface -public interface MutationOperation extends BiFunction -{ - // no changes necessary, only for convenience and readability -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/StrictLogicType.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/StrictLogicType.java deleted file mode 100644 index c830b586..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/StrictLogicType.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.mograsim.logic.core.types; - -/** - * Interface for types that support the basic logic operations only among themselves, making it mathematically closed - * - * @author Christian Femers - * @see LogicType - * - * @param the logic type itself to make the operations closed - */ -public interface StrictLogicType> extends LogicType -{ - // this is just a matter of type parameters -} diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java deleted file mode 100644 index 13f54a01..00000000 --- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java +++ /dev/null @@ -1,662 +0,0 @@ -package net.mograsim.logic.core.wires; - -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.Z; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.mograsim.logic.core.LogicObservable; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; - -/** - * Represents an array of wires that can store n bits of information. - * - * @author Fabian Stemmler - * - */ -public class CoreWire -{ - public final String name; - private BitVector cachedValues; - public final int travelTime; - private List attached = new ArrayList<>(); - public final int width; - List inputs = new ArrayList<>(); - Timeline timeline; - private Bit[] bitsWithoutFusions; - FusedBit[] fusedBits; - - public CoreWire(Timeline timeline, int width, int travelTime) - { - this(timeline, width, travelTime, null); - } - - public CoreWire(Timeline timeline, int width, int travelTime, String name) - { - if (width < 1) - throw new IllegalArgumentException( - String.format("Tried to create an array of wires with width %d, but a width of less than 1 makes no sense.", width)); - this.name = name; - this.timeline = timeline; - this.width = width; - this.travelTime = travelTime; - initValues(); - } - - private void initValues() - { - cachedValues = U.toVector(width); - bitsWithoutFusions = cachedValues.getBits(); - } - - private void setNewValues(BitVector newValues) - { - cachedValues = newValues; - notifyObservers(); - } - - private void invalidateCachedValuesForAllFusedWires() - { - invalidateCachedValues(); - if (fusedBits != null) - for (FusedBit fusion : fusedBits) - if (fusion != null) - fusion.invalidateCachedValuesForAllParticipatingWires(); - } - - private void invalidateCachedValues() - { - cachedValues = null; - notifyObservers(); - } - - void recalculateValuesWithoutFusions() - { - Bit[] bits = new Bit[width]; - if (inputs.isEmpty()) - Arrays.fill(bits, U); - else - { - System.arraycopy(inputs.get(0).getInputValues().getBits(), 0, bits, 0, width); - for (int i = 1; i < inputs.size(); i++) - Bit.join(bits, inputs.get(i).getInputValues().getBits()); - } - bitsWithoutFusions = bits; - if (fusedBits == null) - setNewValues(BitVector.of(bits)); - else - invalidateCachedValuesForAllFusedWires(); - } - - private void recalculatedCachedValues() - { - Bit[] bits; - if (fusedBits == null) - bits = bitsWithoutFusions; - else - { - bits = new Bit[width]; - for (int i = 0; i < width; i++) - { - FusedBit fusion = fusedBits[i]; - if (fusion == null) - bits[i] = bitsWithoutFusions[i]; - else - bits[i] = fusion.getValue(); - } - } - cachedValues = BitVector.of(bits); - } - - /** - * Forces a Wire to take on specific values. If the new values differ from the old ones, the observers of the Wire will be notified. - * WARNING! Use this with care! The preferred way of writing the values is ReadWriteEnd.feedSignals(BitVector) - * - * @param values The values the Wire will have immediately after this method is called - */ - public void forceValues(BitVector values) - { - bitsWithoutFusions = values.getBits(); - invalidateCachedValuesForAllFusedWires(); - notifyObservers(); - } - - /** - * Returns the least significant bit (LSB) - */ - public Bit getValue() - { - return getValue(0); - } - - /** - * Returns the least significant bit (LSB) of the given index - */ - public Bit getValue(int index) - { - return getValues().getLSBit(index); - } - - public BitVector getValues(int start, int end) - { - return getValues().subVector(start, end); - } - - public BitVector getValues() - { - if (cachedValues == null) - recalculatedCachedValues(); - return cachedValues; - } - - /** - * Adds an {@link LogicObserver}, who will be notified when the value of the {@link CoreWire} is updated. - * - * @param ob The {@link LogicObserver} to be notified of changes. - * @return true if the given {@link LogicObserver} was not already registered, false otherwise - * - * @author Fabian Stemmler - */ - boolean attachEnd(ReadEnd end) - { - return attached.add(end); - } - - void detachEnd(ReadEnd end) - { - attached.remove(end); - } - - private void notifyObservers() - { - attached.forEach(ReadEnd::update); - } - - /** - * Create and register a {@link ReadWriteEnd} object, which is tied to this {@link CoreWire}. This {@link ReadWriteEnd} can be written - * to. - */ - public ReadWriteEnd createReadWriteEnd() - { - return new ReadWriteEnd(); - } - - /** - * Create a {@link ReadEnd} object, which is tied to this {@link CoreWire}. This {@link ReadEnd} cannot be written to. - */ - public ReadEnd createReadOnlyEnd() - { - return new ReadEnd(); - } - - void registerInput(ReadWriteEnd toRegister) - { - inputs.add(toRegister); - recalculateValuesWithoutFusions(); - } - - /** - * A {@link ReadEnd} feeds a constant signal into the {@link CoreWire} it is tied to. The combination of all inputs determines the - * {@link CoreWire}s final value. X dominates all other inputs Z does not affect the final value, unless there are no other inputs than - * Z 0 and 1 turn into X when they are mixed - * - * @author Fabian Stemmler - */ - public class ReadEnd implements LogicObservable - { - private List observers = new ArrayList<>(); - - ReadEnd() - { - super(); - CoreWire.this.attachEnd(this); - } - - public void update() - { - notifyObservers(); - } - - /** - * Included for convenient use on {@link CoreWire}s of width 1. - * - * @return The value of bit 0. - * - * @author Fabian Stemmler - */ - public Bit getValue() - { - return CoreWire.this.getValue(); - } - - /** - * @param index Index of the requested bit. - * @return The value of the indexed bit. - * - * @author Fabian Stemmler - */ - public Bit getValue(int index) - { - return CoreWire.this.getValue(index); - } - - public BitVector getValues() - { - return CoreWire.this.getValues(); - } - - /** - * @param start Start of the wanted segment. (inclusive) - * @param end End of the wanted segment. (exclusive) - * @return The values of the segment of {@link Bit}s indexed. - * - * @author Fabian Stemmler - */ - public BitVector getValues(int start, int end) - { - return CoreWire.this.getValues(start, end); - } - - @Override - public String toString() - { - return CoreWire.this.toString(); - } - - public void close() - { - inputs.remove(this); - detachEnd(this); - recalculateValuesWithoutFusions(); - } - - public int width() - { - return width; - } - - public CoreWire getWire() - { - return CoreWire.this; - } - - @Override - public void registerObserver(LogicObserver ob) - { - observers.add(ob); - } - - @Override - public void deregisterObserver(LogicObserver ob) - { - observers.remove(ob); - } - -// void registerCloseObserver(LogicObserver ob) -// { -// closeObserver.add(ob); -// } -// -// void deregisterCloseObserver(LogicObserver ob) -// { -// closeObserver.remove(ob); -// } - - @Override - public void notifyObservers() - { - observers.forEach(ob -> ob.update(this)); - } - } - - public class ReadWriteEnd extends ReadEnd - { - private boolean open; - private boolean isWriting; - private BitVector inputValues; - - ReadWriteEnd() - { - super(); - open = true; - isWriting = true; - initValues(); - registerInput(this); - } - - private void initValues() - { - inputValues = U.toVector(width); - } - - /** - * Sets the wires values. This takes up time, as specified by the {@link CoreWire}s travel time. - * - * @param newValues The new values the wires should take on. - * - * @author Fabian Stemmler - */ - public void feedSignals(Bit... newValues) - { - feedSignals(BitVector.of(newValues)); - } - - // TODO what if this is called multiple times at the same simulation time? (happens in component unit tests) - public void feedSignals(BitVector newValues) - { - if (newValues.length() != width) - throw new IllegalArgumentException( - String.format("Attempted to input %d bits instead of %d bits.", newValues.length(), width)); - if (!open) - throw new IllegalStateException("Attempted to write to closed WireArrayEnd."); - timeline.addEvent(e -> setValues(newValues), travelTime); - } - - /** - * Sets values of a subarray of wires. This takes up time, as specified by the {@link CoreWire}s travel time. - * - * @param bitVector The new values the wires should take on. - * @param startingBit The first index of the subarray of wires. - * - * @author Fabian Stemmler - */ - public void feedSignals(int startingBit, BitVector bitVector) - { - if (!open) - throw new IllegalStateException("Attempted to write to closed WireArrayEnd."); - timeline.addEvent(e -> setValues(startingBit, bitVector), travelTime); - } - - /** - * Sets the values that are being fed into the {@link CoreWire}. The preferred way of setting {@link ReadWriteEnd} values is via - * feedValues(...) with a delay. - */ - void setValues(int startingBit, BitVector newValues) - { - // index check covered in equals - if (!inputValues.equalsWithOffset(newValues, startingBit)) - { - Bit[] vals = inputValues.getBits(); - System.arraycopy(newValues.getBits(), 0, vals, startingBit, newValues.length()); - inputValues = BitVector.of(vals); - CoreWire.this.recalculateValuesWithoutFusions(); - } - } - - /** - * Sets the values that are being fed into the {@link CoreWire}. The preferred way of setting {@link ReadWriteEnd} values is via - * feedValues(...) with a delay. - */ - void setValues(BitVector newValues) - { - if (inputValues.equals(newValues)) - return; - inputValues = newValues; - CoreWire.this.recalculateValuesWithoutFusions(); - } - - /** - * @return The value (of bit 0) the {@link ReadEnd} is currently feeding into the associated {@link CoreWire}.Returns the least - * significant bit (LSB) - */ - public Bit getInputValue() - { - return getInputValue(0); - } - - /** - * @return The value which the {@link ReadEnd} is currently feeding into the associated {@link CoreWire} at the indexed {@link Bit}. - * Returns the least significant bit (LSB) - * - */ - public Bit getInputValue(int index) - { - return inputValues.getLSBit(index); - } - - /** - * @return A copy (safe to modify) of the values the {@link ReadEnd} is currently feeding into the associated {@link CoreWire}. - */ - public BitVector getInputValues() - { - return inputValues; - } - - public BitVector getInputValues(int start, int end) - { - return inputValues.subVector(start, end); - } - - /** - * {@link ReadEnd} now feeds Z into the associated {@link CoreWire}. - */ - public void clearSignals() - { - feedSignals(Z.toVector(width)); - } - - public BitVector wireValuesExcludingMe() - { - BitVectorMutator mutator = BitVectorMutator.empty(); - boolean modified = false; - for (ReadWriteEnd wireEnd : inputs) - { - if (wireEnd == this) - continue; - modified = true; - mutator.join(wireEnd.inputValues); - } - if (!modified) - mutator.join(BitVector.of(Bit.Z, width)); - return mutator.toBitVector(); - } - - @Override - public String toString() - { - return inputValues.toString(); - } - - @Override - public void close() - { - super.close(); - open = false; - } - - void setWriting(boolean isWriting) - { - if (this.isWriting != isWriting) - { - this.isWriting = isWriting; - if (isWriting) - inputs.add(this); - else - inputs.remove(this); - CoreWire.this.recalculateValuesWithoutFusions(); - } - } - - boolean isWriting() - { - return isWriting; - } - } - - @Override - public String toString() - { - String name = this.name == null ? String.format("0x%08x", hashCode()) : this.name; - return String.format("wire %s value: %s inputs: %s", name, getValues(), inputs); - } - - public static ReadEnd[] extractEnds(CoreWire[] w) - { - ReadEnd[] inputs = new ReadEnd[w.length]; - for (int i = 0; i < w.length; i++) - inputs[i] = w[i].createReadWriteEnd(); - return inputs; - } - - /** - * - * Fuses two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: The bits are - * permanently fused together. - * - * @param a The {@link CoreWire} to be fused with b - * @param b The {@link CoreWire} to be fused with a - */ - public static void fuse(CoreWire a, CoreWire b) - { - fuse(a, b, 0, 0, a.width); - } - - /** - * Fuses the selected bits of two wires together. If the bits change in one Wire, the other is changed accordingly immediately. Warning: - * The bits are permanently fused together. - * - * @param a The {@link CoreWire} to be (partially) fused with b - * @param b The {@link CoreWire} to be (partially) fused with a - * @param fromA The first bit of {@link CoreWire} a to be fused - * @param fromB The first bit of {@link CoreWire} b to be fused - * @param width The amount of bits to fuse - */ - public static void fuse(CoreWire a, CoreWire b, int fromA, int fromB, int width) - { - // iterate in this direction to be fail-fast (rely on the checks in fuse(Wire, Wire, int, int) - for (int i = width - 1; i >= 0; i--) - fuse(a, b, fromA + i, fromB + i); - } - - /** - * Fuses one bit of two wires together. If this bit changes in one Wire, the other is changed accordingly immediately. Warning: The bits - * are permanently fused together. - * - * @param a The {@link CoreWire} to be (partially) fused with b - * @param b The {@link CoreWire} to be (partially) fused with a - * @param bitA The bit of {@link CoreWire} a to be fused - * @param bitB The bit of {@link CoreWire} b to be fused - */ - public static void fuse(CoreWire a, CoreWire b, int bitA, int bitB) - { - if (bitA >= a.width) - throw new IllegalArgumentException("No bit " + bitA + " in " + a + " (width " + a.width + ")"); - if (bitB >= b.width) - throw new IllegalArgumentException("No bit " + bitB + " in " + b + " (width " + b.width + ")"); - if (a.fusedBits == null) - a.fusedBits = new FusedBit[a.width]; - if (b.fusedBits == null) - b.fusedBits = new FusedBit[b.width]; - FusedBit oldFusionA = a.fusedBits[bitA]; - FusedBit oldFusionB = b.fusedBits[bitB]; - if (oldFusionA == null) - if (oldFusionB == null) - { - FusedBit fusion = new FusedBit(); - fusion.addParticipatingWireBit(a, bitA); - fusion.addParticipatingWireBit(b, bitB); - } else - oldFusionB.addParticipatingWireBit(a, bitA); - else if (oldFusionB == null) - oldFusionA.addParticipatingWireBit(b, bitB); - else - oldFusionA.mergeOtherIntoThis(oldFusionB); - } - - private static class FusedBit - { - private final Set participatingWireBits; - - public FusedBit() - { - this.participatingWireBits = new HashSet<>(); - } - - public void addParticipatingWireBit(CoreWire w, int bit) - { - addParticipatingWireBit(new WireBit(w, bit)); - } - - private void addParticipatingWireBit(WireBit wb) - { - wb.wire.fusedBits[wb.bit] = this; - participatingWireBits.add(wb); - wb.wire.invalidateCachedValuesForAllFusedWires(); - } - - public void mergeOtherIntoThis(FusedBit other) - { - for (WireBit wb : other.participatingWireBits) - addParticipatingWireBit(wb); - } - - public void invalidateCachedValuesForAllParticipatingWires() - { - for (WireBit wb : participatingWireBits) - wb.wire.invalidateCachedValues(); - } - - public Bit getValue() - { - Bit result = null; - for (WireBit wb : participatingWireBits) - if (!wb.wire.inputs.isEmpty()) - { - Bit bit = wb.wire.bitsWithoutFusions[wb.bit]; - result = result == null ? bit : result.join(bit); - } - return result == null ? U : result; - } - } - - private static class WireBit - { - public final CoreWire wire; - public final int bit; - - public WireBit(CoreWire wire, int bit) - { - this.wire = wire; - this.bit = bit; - } - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + bit; - result = prime * result + ((wire == null) ? 0 : wire.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - WireBit other = (WireBit) obj; - if (bit != other.bit) - return false; - if (wire == null) - { - if (other.wire != null) - return false; - } else if (!wire.equals(other.wire)) - return false; - return true; - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java deleted file mode 100644 index 12df5844..00000000 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/CoreComponentTest.java +++ /dev/null @@ -1,465 +0,0 @@ -package net.mograsim.logic.core.tests; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import net.mograsim.logic.core.components.CoreDemux; -import net.mograsim.logic.core.components.CoreMux; -import net.mograsim.logic.core.components.CoreTriStateBuffer; -import net.mograsim.logic.core.components.CoreUnidirectionalMerger; -import net.mograsim.logic.core.components.CoreUnidirectionalSplitter; -import net.mograsim.logic.core.components.gates.CoreAndGate; -import net.mograsim.logic.core.components.gates.CoreNandGate; -import net.mograsim.logic.core.components.gates.CoreNorGate; -import net.mograsim.logic.core.components.gates.CoreNotGate; -import net.mograsim.logic.core.components.gates.CoreOrGate; -import net.mograsim.logic.core.components.gates.CoreXorGate; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; - -@SuppressWarnings("unused") -class CoreComponentTest -{ - private Timeline t = new Timeline(11); - - @BeforeEach - void resetTimeline() - { - t.reset(); - } - - @Test - void circuitExampleTest() - { - CoreWire a = new CoreWire(t, 1, 1), b = new CoreWire(t, 1, 1), c = new CoreWire(t, 1, 10), d = new CoreWire(t, 2, 1), - e = new CoreWire(t, 1, 1), f = new CoreWire(t, 1, 1), g = new CoreWire(t, 1, 1), h = new CoreWire(t, 2, 1), - i = new CoreWire(t, 2, 1), j = new CoreWire(t, 1, 1), k = new CoreWire(t, 1, 1); - new CoreAndGate(t, 1, f.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); - new CoreNotGate(t, 1, f.createReadOnlyEnd(), g.createReadWriteEnd()); - new CoreUnidirectionalMerger(t, h.createReadWriteEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd()); - new CoreMux(t, 1, i.createReadWriteEnd(), e.createReadOnlyEnd(), h.createReadOnlyEnd(), d.createReadOnlyEnd()); - new CoreUnidirectionalSplitter(t, i.createReadOnlyEnd(), k.createReadWriteEnd(), j.createReadWriteEnd()); - - a.createReadWriteEnd().feedSignals(Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ONE); - c.createReadWriteEnd().feedSignals(Bit.ZERO); - d.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE); - e.createReadWriteEnd().feedSignals(Bit.ZERO); - - t.executeAll(); - - assertEquals(Bit.ONE, j.getValue()); - assertEquals(Bit.ZERO, k.getValue()); - } - - @Test - void splitterTest() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 2, 1), c = new CoreWire(t, 3, 1), in = new CoreWire(t, 8, 1); - in.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - new CoreUnidirectionalSplitter(t, in.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), c.createReadWriteEnd()); - - t.executeAll(); - - assertBitArrayEquals(a.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO); - assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO); - assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE); - } - - @Test - void mergerTest() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 2, 1), c = new CoreWire(t, 3, 1), out = new CoreWire(t, 8, 1); - a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO); - c.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - - new CoreUnidirectionalMerger(t, out.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); - - t.executeAll(); - - assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - } - - @Test - void fusionTest1() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 2, 1), c = new CoreWire(t, 3, 1), out = new CoreWire(t, 8, 1); - CoreWire.fuse(a, out, 0, 0, a.width); - CoreWire.fuse(b, out, 0, a.width, b.width); - CoreWire.fuse(c, out, 0, a.width + b.width, c.width); - ReadWriteEnd rA = a.createReadWriteEnd(); - rA.feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO); - ReadWriteEnd rB = b.createReadWriteEnd(); - rB.feedSignals(Bit.ONE, Bit.ZERO); - ReadWriteEnd rC = c.createReadWriteEnd(); - rC.feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - - t.executeAll(); - assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - out.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - t.executeAll(); - assertBitArrayEquals(rA.getValues(), Bit.X, Bit.X, Bit.X); - assertBitArrayEquals(rB.getValues(), Bit.X, Bit.X); - assertBitArrayEquals(rC.getValues(), Bit.X, Bit.X, Bit.X); - rA.clearSignals(); - rB.clearSignals(); - rC.clearSignals(); - t.executeAll(); - assertBitArrayEquals(rA.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE); - assertBitArrayEquals(rB.getValues(), Bit.ZERO, Bit.ONE); - assertBitArrayEquals(rC.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO); - } - - @Test - void fusionTest2() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 3, 1); - CoreWire.fuse(a, b); - ReadWriteEnd rw = a.createReadWriteEnd(); - t.executeAll(); - assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U); - - rw.feedSignals(Bit.ONE, Bit.U, Bit.Z); - t.executeAll(); - assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.U, Bit.Z); - } - - @Test - void fusionTest3() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 3, 1); - a.createReadWriteEnd().feedSignals(Bit.Z, Bit.U, Bit.X); - t.executeAll(); - CoreWire.fuse(a, b); - t.executeAll(); - assertBitArrayEquals(b.getValues(), Bit.Z, Bit.U, Bit.X); - } - - @Test - void fusionTest4() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 3, 1); - a.createReadWriteEnd(); - t.executeAll(); - - CoreWire.fuse(a, b); - t.executeAll(); - assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U); - } - -// @Test -// void connectorTest() -// { -// t.reset(); -// Wire a = new Wire(t, 3, 1), b = new Wire(t, 3, 1); -// new Connector(t, a.createReadWriteEnd(), b.createReadWriteEnd()).connect(); -//// b.createReadWriteEnd(); -// a.createReadWriteEnd(); -// t.executeAll(); -// assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U); -// } - - @Test - void triStateBufferTest() - { - CoreWire a = new CoreWire(t, 1, 1), b = new CoreWire(t, 1, 1), en = new CoreWire(t, 1, 1), notEn = new CoreWire(t, 1, 1); - new CoreNotGate(t, 1, en.createReadOnlyEnd(), notEn.createReadWriteEnd()); - new CoreTriStateBuffer(t, 1, a.createReadOnlyEnd(), b.createReadWriteEnd(), en.createReadOnlyEnd()); - new CoreTriStateBuffer(t, 1, b.createReadOnlyEnd(), a.createReadWriteEnd(), notEn.createReadOnlyEnd()); - - ReadWriteEnd enI = en.createReadWriteEnd(), aI = a.createReadWriteEnd(), bI = b.createReadWriteEnd(); - enI.feedSignals(Bit.ONE); - aI.feedSignals(Bit.ONE); - bI.feedSignals(Bit.Z); - - t.executeAll(); - - assertEquals(Bit.ONE, b.getValue()); - - bI.feedSignals(Bit.ZERO); - - t.executeAll(); - - assertEquals(Bit.X, b.getValue()); - assertEquals(Bit.ONE, a.getValue()); - - aI.clearSignals(); - enI.feedSignals(Bit.ZERO); - - t.executeAll(); - - assertEquals(Bit.ZERO, a.getValue()); - - } - - @Test - void muxTest() - { - CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5), - out = new CoreWire(t, 4, 1); - ReadWriteEnd selectIn = select.createReadWriteEnd(); - - selectIn.feedSignals(Bit.ZERO, Bit.ZERO); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - c.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - - new CoreMux(t, 1, out.createReadWriteEnd(), select.createReadOnlyEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), - c.createReadOnlyEnd()); - t.executeAll(); - - assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - selectIn.feedSignals(Bit.ONE, Bit.ZERO); - t.executeAll(); - - assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - - selectIn.feedSignals(Bit.ONE, Bit.ONE); - t.executeAll(); - - assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z); - - } - - @Test - void demuxTest() - { - CoreWire a = new CoreWire(t, 4, 3), b = new CoreWire(t, 4, 6), c = new CoreWire(t, 4, 4), select = new CoreWire(t, 2, 5), - in = new CoreWire(t, 4, 1); - ReadWriteEnd selectIn = select.createReadWriteEnd(); - - selectIn.feedSignals(Bit.ZERO, Bit.ZERO); - in.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - - new CoreDemux(t, 1, in.createReadOnlyEnd(), select.createReadOnlyEnd(), a.createReadWriteEnd(), b.createReadWriteEnd(), - c.createReadWriteEnd()); - t.executeAll(); - - assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U); - assertBitArrayEquals(c.getValues(), Bit.U, Bit.U, Bit.U, Bit.U); - selectIn.feedSignals(Bit.ONE, Bit.ZERO); - t.executeAll(); - - assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z); - assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U); - assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO); - - selectIn.feedSignals(Bit.ONE, Bit.ONE); - t.executeAll(); - - assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z); - assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U); - assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z); - - } - - @Test - void andTest() - { - CoreWire a = new CoreWire(t, 4, 1), b = new CoreWire(t, 4, 3), c = new CoreWire(t, 4, 1); - new CoreAndGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - - t.executeAll(); - - assertBitArrayEquals(c.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO); - } - - @Test - void orTest() - { - CoreWire a = new CoreWire(t, 4, 1), b = new CoreWire(t, 4, 3), c = new CoreWire(t, 4, 1); - new CoreOrGate(t, 1, c.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd()); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - - t.executeAll(); - - assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE); - } - - @Test - void nandTest() - { - CoreWire a = new CoreWire(t, 4, 1), b = new CoreWire(t, 4, 3), c = new CoreWire(t, 4, 1), d = new CoreWire(t, 4, 1); - new CoreNandGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - c.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - - t.executeAll(); - - assertBitArrayEquals(d.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ONE); - } - - @Test - void norTest() - { - CoreWire a = new CoreWire(t, 4, 1), b = new CoreWire(t, 4, 3), c = new CoreWire(t, 4, 1), d = new CoreWire(t, 4, 1); - new CoreNorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - b.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE); - c.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO); - - t.executeAll(); - - assertBitArrayEquals(d.getValues(), Bit.ZERO, Bit.ZERO, Bit.ONE, Bit.ZERO); - } - - @Test - void xorTest() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 3, 2), c = new CoreWire(t, 3, 1), d = new CoreWire(t, 3, 1); - new CoreXorGate(t, 1, d.createReadWriteEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd()); - a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); - b.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - c.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE); - - t.executeAll(); - - assertBitArrayEquals(d.getValues(), Bit.ZERO, Bit.ONE, Bit.ONE); - } - - @Test - void notTest() - { - CoreWire a = new CoreWire(t, 3, 1), b = new CoreWire(t, 3, 2); - new CoreNotGate(t, 1, a.createReadOnlyEnd(), b.createReadWriteEnd()); - a.createReadWriteEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE); - - t.executeAll(); - - assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO, Bit.ZERO); - } - - @Test - void rsLatchCircuitTest() - { - CoreWire r = new CoreWire(t, 1, 1), s = new CoreWire(t, 1, 1), t1 = new CoreWire(t, 1, 15), t2 = new CoreWire(t, 1, 1), - q = new CoreWire(t, 1, 1), nq = new CoreWire(t, 1, 1); - - new CoreOrGate(t, 1, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd()); - new CoreOrGate(t, 1, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd()); - new CoreNotGate(t, 1, t2.createReadOnlyEnd(), q.createReadWriteEnd()); - new CoreNotGate(t, 1, t1.createReadOnlyEnd(), nq.createReadWriteEnd()); - - ReadWriteEnd sIn = s.createReadWriteEnd(), rIn = r.createReadWriteEnd(); - - sIn.feedSignals(Bit.ONE); - rIn.feedSignals(Bit.ZERO); - - t.executeAll(); - - assertEquals(Bit.ONE, q.getValue()); - assertEquals(Bit.ZERO, nq.getValue()); - - sIn.feedSignals(Bit.ZERO); - - t.executeAll(); - assertEquals(Bit.ONE, q.getValue()); - assertEquals(Bit.ZERO, nq.getValue()); - - rIn.feedSignals(Bit.ONE); - - t.executeAll(); - - assertEquals(Bit.ZERO, q.getValue()); - assertEquals(Bit.ONE, nq.getValue()); - } - - @Test - void numericValueTest() - { - CoreWire a = new CoreWire(t, 4, 1); - a.createReadWriteEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ONE); - - t.executeAll(); - - assertEquals(11, a.getValues().getUnsignedValueLong()); - assertEquals(-5, a.getValues().getSignedValueLong()); - } - - boolean flag = false; - - @Test - void simpleTimelineTest() - { - Timeline t = new Timeline(3); - flag = false; - t.addEvent((e) -> - { - if (!flag) - fail("Events executed out of order!"); - flag = false; - }, 15); - t.addEvent((e) -> - { - if (flag) - fail("Events executed out of order!"); - flag = true; - }, 10); - t.addEvent((e) -> - { - if (flag) - fail("Events executed out of order!"); - flag = true; - }, 20); - t.addEvent((e) -> - { - fail("Only supposed to execute until timestamp 20, not 25"); - }, 25); - - t.executeUntil(t.laterThan(20), 100); - - if (!flag) - fail("Not all events were executed in order!"); - } - - // TODO: Adapt this test, now that update notifications are issued whenever any input to a wire changes - @Disabled("Out of date") - @Test - void multipleInputs() - { - CoreWire w = new CoreWire(t, 2, 1); - ReadWriteEnd wI1 = w.createReadWriteEnd(), wI2 = w.createReadWriteEnd(); - wI1.feedSignals(Bit.ONE, Bit.Z); - wI2.feedSignals(Bit.Z, Bit.X); - t.executeAll(); - assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X); - - wI2.feedSignals(Bit.ZERO, Bit.Z); - t.executeAll(); - assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z); - - wI2.feedSignals(Bit.Z, Bit.Z); - t.executeAll(); - assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z); - - wI2.feedSignals(Bit.ONE, Bit.Z); - ReadEnd rE = w.createReadOnlyEnd(); - rE.registerObserver((i) -> fail("WireEnd notified observer, although value did not change.")); - t.executeAll(); - rE.close(); - wI1.feedSignals(Bit.X, Bit.X); - t.executeAll(); - wI1.registerObserver((i) -> fail("WireEnd notified observer, although it was closed.")); - wI1.close(); - assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z); - } - - private static void assertBitArrayEquals(BitVector actual, Bit... expected) - { - assertArrayEquals(expected, actual.getBits()); - } -} diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java deleted file mode 100644 index a3689a30..00000000 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java +++ /dev/null @@ -1,302 +0,0 @@ -package net.mograsim.logic.core.tests; - -import java.awt.Color; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.WindowConstants; - -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.components.gates.CoreNotGate; -import net.mograsim.logic.core.components.gates.CoreOrGate; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.Timeline.ExecutionResult; -import net.mograsim.logic.core.wires.CoreWire; - -public class GUITest extends JPanel -{ - - private static final long serialVersionUID = 1L; - - private static final int WIRE_DELAY = 40; - private static final int OR_DELAY = 100; - private static final int NOT_DELAY = 100; - - private Timeline t = new Timeline(11); - - CoreWire r = new CoreWire(t, 1, WIRE_DELAY); - CoreWire s = new CoreWire(t, 1, WIRE_DELAY); - CoreWire t1 = new CoreWire(t, 1, WIRE_DELAY); - CoreWire t2 = new CoreWire(t, 1, WIRE_DELAY); - CoreWire q = new CoreWire(t, 1, WIRE_DELAY); - CoreWire nq = new CoreWire(t, 1, WIRE_DELAY); - - CoreManualSwitch rIn = new CoreManualSwitch(t, r.createReadWriteEnd()); - CoreManualSwitch sIn = new CoreManualSwitch(t, s.createReadWriteEnd()); - - CoreOrGate or1 = new CoreOrGate(t, OR_DELAY, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd()); - CoreOrGate or2 = new CoreOrGate(t, OR_DELAY, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd()); - CoreNotGate not1 = new CoreNotGate(t, NOT_DELAY, t2.createReadOnlyEnd(), q.createReadWriteEnd()); - CoreNotGate not2 = new CoreNotGate(t, NOT_DELAY, t1.createReadOnlyEnd(), nq.createReadWriteEnd()); - - Map switchMap = new HashMap<>(); - - int height; - int width; - boolean sizeChanged; - - public GUITest() - { - addMouseListener(new MouseListener() - { - - @Override - public void mouseReleased(MouseEvent e) - { - for (Entry dim : switchMap.entrySet()) - { - if (dim.getValue().contains(e.getPoint())) - { - dim.getKey().switchFullOff(); - repaint(); - } - } - } - - @Override - public void mousePressed(MouseEvent e) - { - for (Entry dim : switchMap.entrySet()) - { - if (dim.getValue().contains(e.getPoint())) - { - dim.getKey().switchFullOn(); - repaint(); - } - } - } - - @Override - public void mouseExited(MouseEvent e) - { - // none - } - - @Override - public void mouseEntered(MouseEvent e) - { - // none - } - - @Override - public void mouseClicked(MouseEvent e) - { - // If you want toggle buttons, use this code instead -// for (Entry dim : switchMap.entrySet()) { -// if (dim.getValue().contains(e.getPoint())) { -// dim.getKey().toggle(); -// repaint(); -// } -// } - } - }); - } - - public Timeline getTimeline() - { - return t; - } - - @Override - public void paint(Graphics some_g) - { - super.paint(some_g); - Graphics2D g = ((Graphics2D) some_g); - g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP); - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - - checkSizeChange(); - adaptFont(g); - - drawWire(g, r, "r", 2, 9, 4, 9); - - drawWire(g, s, "s", 2, 3, 4, 3); - - drawWire(g, t2, "t2", 5, 8.5, 6, 8.5); - - drawWire(g, t1, "t1", 5, 3.5, 6, 3.5); - - drawWire(g, q, "q", 7, 8.5, 9, 8.5); - - drawWire(g, nq, "nq", 7, 3.5, 9, 3.5); - - drawWire(g, q, "", 7.5, 8.5, 7.5, 7.5); - drawWire(g, q, "", 7.5, 7.5, 3, 4.5); - drawWire(g, q, "", 3, 4.5, 3, 4); - drawWire(g, q, "q", 3, 4, 4, 4); - - drawWire(g, nq, "", 7.5, 3.5, 7.5, 4.5); - drawWire(g, nq, "", 7.5, 4.5, 3, 7.5); - drawWire(g, nq, "", 3, 7.5, 3, 8); - drawWire(g, nq, "nq", 3, 8, 4, 8); - - drawSquare(g, 4, 8, "OR"); - drawSquare(g, 4, 3, "OR"); - - drawSquare(g, 6, 8, "NOT"); - drawSquare(g, 6, 3, "NOT"); - - drawSwitch(g, rIn, "Switch R", 0.5, 8.25, 2, 9.75); - drawSwitch(g, sIn, "Switch S", 0.5, 2.25, 2, 3.75); - - drawString(g, "Hint: drag the cursor out of the pressed switch to keep it's state", 5, 0, 0.0, 1.0); - } - - private void checkSizeChange() - { - sizeChanged = height != getHeight() || width != getWidth(); - if (sizeChanged) - { - height = getHeight(); - width = getWidth(); - } - } - - private void adaptFont(Graphics g) - { - g.setFont(g.getFont().deriveFont(Math.min(height, width) / 40f)); - } - - @SuppressWarnings("static-method") - private void drawString(Graphics g, String s, int x, int y, double anchorX, double anchorY) - { - int h = g.getFontMetrics().getAscent(); - int w = g.getFontMetrics().stringWidth(s); - g.drawString(s, x - (int) (w * anchorX), y + (int) (h * anchorY)); - } - - private void drawWire(Graphics g, CoreWire wa, String name, double x1, double y1, double x2, double y2) - { - setTo(g, wa); - g.drawLine(gX(x1), gY(y1), gX(x2), gY(y2)); - drawString(g, name, (gX(x1) + gX(x2)) / 2, (gY(y1) + gY(y2)) / 2 - 5, 0, 0); - } - - private void drawSquare(Graphics g, int posX, int posY, String text) - { - int x1 = gX(posX) - 5; - int x2 = gX(posX + 1) + 5; - int y1 = gY(posY) - 5; - int y2 = gY(posY + 1) + 5; - - g.setColor(Color.WHITE); - g.fillRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1); - setBlack(g); - g.drawRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1); - drawString(g, text, (x1 + x2) / 2, (y1 + y2) / 2, 0.5, 0.5); - - } - - private void drawSwitch(Graphics g, CoreManualSwitch ms, String text, double posX1, double posY1, double posX2, double posY2) - { - int x1 = gX(posX1) - 5; - int x2 = gX(posX2) + 5; - int y1 = gY(posY1) - 5; - int y2 = gY(posY2) + 5; - - if (sizeChanged) - { - Rectangle r = new Rectangle(x1, y1, x2 - x1, y2 - y1); - switchMap.put(ms, r); - } - - g.setColor(ms.isFullOn() ? Color.getHSBColor(.3f, .5f, 1f) : Color.WHITE); - g.fillRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1); - setBlack(g); - g.drawRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1); - drawString(g, text, (x1 + x2) / 2, (y1 + y2) / 2, 0.5, 0.5); - } - - private static void setBlack(Graphics g) - { - g.setColor(Color.BLACK); - } - - private static void setTo(Graphics g, CoreWire wa) - { - switch (wa.getValue()) - { - case ONE: - g.setColor(Color.GREEN); - break; - case X: - g.setColor(Color.RED); - break; - case Z: - g.setColor(Color.DARK_GRAY); - break; - case ZERO: - g.setColor(Color.BLACK); - break; - case U: - g.setColor(Color.MAGENTA); - break; - default: - throw new IllegalArgumentException(); - } - } - - private int gY(double pos) - { - return (int) (pos * height / 11); - } - - private int gX(double pos) - { - return (int) (pos * width / 11) + 50; - } - - public static void main(String[] args) - { - JFrame f = new JFrame("Test circuit 1.0.0"); - GUITest gt = new GUITest(); - f.add(gt); - f.setSize(800, 600); - f.setLocation(500, 400); - f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - f.setVisible(true); - - long begin = System.currentTimeMillis(); - - long lastFrame = begin; - long updateT = 16; - - while (f.isVisible()) - { - ExecutionResult er = gt.getTimeline().executeUntil(gt.getTimeline().laterThan((lastFrame - begin) * 3), lastFrame + 14); -// if (t.hasNext()) -// t.executeNext(); - if (er != ExecutionResult.NOTHING_DONE) - gt.repaint(12); - try - { - Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0)); - } - catch (Exception e) - { - e.printStackTrace(); - } - lastFrame = System.currentTimeMillis(); - } - } -} diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/TestCoreBitDisplay.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/TestCoreBitDisplay.java deleted file mode 100644 index 5056345f..00000000 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/TestCoreBitDisplay.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.mograsim.logic.core.tests; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; - -import java.util.function.LongConsumer; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.timeline.TimelineEventHandler; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; - -public final class TestCoreBitDisplay extends CoreBitDisplay -{ - - public TestCoreBitDisplay(Timeline timeline, ReadEnd in) - { - super(timeline, in); - } - - public void assertDisplays(Bit... expected) - { - assertArrayEquals(expected, getDisplayedValue().getBits()); - } - - public void assertAfterSimulationIs(Bit... expected) - { - timeline.executeAll(); - assertDisplays(expected); - } - - public void assertAfterSimulationIs(LongConsumer r, Bit... expected) - { - while (timeline.hasNext()) - { - timeline.executeNext(); - r.accept(timeline.getSimulationTime()); - } - assertDisplays(expected); - } - - @Override - protected TimelineEventHandler compute() - { - TimelineEventHandler handler = super.compute(); - return e -> - { - handler.handle(e); - System.out.println("update: value is " + getDisplayedValue()); - }; - } -} diff --git a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java b/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java deleted file mode 100644 index 2b46a6c7..00000000 --- a/net.mograsim.logic.core/test/net/mograsim/logic/core/types/BitVectorTest.java +++ /dev/null @@ -1,289 +0,0 @@ -package net.mograsim.logic.core.types; - -import static net.mograsim.logic.core.types.BitVector.*; -import static net.mograsim.logic.core.types.Bit.*; -import static org.junit.jupiter.api.Assertions.*; - -import java.math.BigInteger; -import java.util.Iterator; - -import org.junit.jupiter.api.Test; - -class BitVectorTest -{ - - @Test - void testOfBitArray() - { - BitVector.of(); // should be allowed and work - - assertSame(SINGLE_U, BitVector.of(U)); - assertSame(SINGLE_X, BitVector.of(X)); - assertSame(SINGLE_0, BitVector.of(ZERO)); - assertSame(SINGLE_1, BitVector.of(ONE)); - assertSame(SINGLE_Z, BitVector.of(Z)); - } - - @Test - void testOfBitInt() - { - assertEquals(BitVector.of(), BitVector.of(ONE, 0)); - - assertSame(SINGLE_U, BitVector.of(U, 1)); - assertSame(SINGLE_X, BitVector.of(X, 1)); - assertSame(SINGLE_0, BitVector.of(ZERO, 1)); - assertSame(SINGLE_1, BitVector.of(ONE, 1)); - assertSame(SINGLE_Z, BitVector.of(Z, 1)); - - assertEquals(BitVector.of(X, X, X), BitVector.of(X, 3)); - } - - @Test - void testGetUnsignedValue() - { - assertEquals(BigInteger.valueOf(0b101), BitVector.parse("101").getUnsignedValue()); - assertEquals(BigInteger.valueOf(0b01010), BitVector.parse("01010").getUnsignedValue()); - assertEquals(BigInteger.valueOf(0), BitVector.parse("0000").getUnsignedValue()); - assertEquals(BigInteger.valueOf(0b0000000101), BitVector.parse("0000000101").getUnsignedValue()); - assertEquals(BigInteger.valueOf(0b1010000000), BitVector.parse("1010000000").getUnsignedValue()); - - assertThrows(NumberFormatException.class, () -> BitVector.parse("00X1").getUnsignedValue()); - } - - @Test - void testOfLongInt() - { - assertEquals(BitVector.parse("101"), BitVector.from(0b101L, 3)); - assertEquals(BitVector.parse("01010"), BitVector.from(0b01010L, 5)); - assertEquals(BitVector.parse("10101"), BitVector.from(-11L, 5)); - assertEquals(BitVector.parse("0000"), BitVector.from(0L, 4)); - } - - @Test - void testOfBigIntegerInt() - { - assertEquals(BitVector.parse("101"), BitVector.from(BigInteger.valueOf(0b101), 3)); - assertEquals(BitVector.parse("01010"), BitVector.from(BigInteger.valueOf(0b01010), 5)); - assertEquals(BitVector.parse("10101"), BitVector.from(BigInteger.valueOf(-11), 5)); - assertEquals(BitVector.parse("0000"), BitVector.from(BigInteger.valueOf(0), 4)); - } - - @Test - void testMutator() - { - var bv = BitVector.SINGLE_1; - var bvm = bv.mutator(); - - assertFalse(bvm.isEmpty()); - assertEquals(ONE, bvm.getLSBit(0)); - assertEquals(SINGLE_1, bvm.toBitVector()); - } - - @Test - void testGetMSBit() - { - assertEquals(ONE, SINGLE_1.getMSBit(0)); - assertEquals(ONE, BitVector.of(ONE, X, X, X).getMSBit(0)); - assertEquals(ONE, BitVector.of(X, X, X, X, ONE, X).getMSBit(4)); - } - - @Test - void testGetLSBit() - { - assertEquals(ONE, SINGLE_1.getLSBit(0)); - assertEquals(ONE, BitVector.of(X, X, X, ONE).getLSBit(0)); - assertEquals(ONE, BitVector.of(X, X, X, X, ONE, X).getLSBit(1)); - } - - @Test - void testGetBits() - { - assertArrayEquals(new Bit[] { X, ONE, Z }, BitVector.of(X, ONE, Z).getBits()); - assertArrayEquals(new Bit[] { X, ONE, Z }, BitVector.parse("X1Z").getBits()); - } - - @Test - void testIsBinary() - { - assertTrue(SINGLE_0.isBinary()); - assertTrue(SINGLE_1.isBinary()); - - assertFalse(SINGLE_U.isBinary()); - assertFalse(SINGLE_X.isBinary()); - assertFalse(SINGLE_Z.isBinary()); - - assertTrue(BitVector.of(ONE, ZERO, ONE, ONE, ZERO).isBinary()); - assertFalse(BitVector.of(ONE, ZERO, ZERO, X).isBinary()); - } - - @Test - void testJoin() - { - // binary - assertEquals(SINGLE_0, SINGLE_0.join(SINGLE_0)); - assertEquals(SINGLE_X, SINGLE_0.join(SINGLE_1)); - assertEquals(SINGLE_1, SINGLE_1.join(SINGLE_1)); - - // other - assertEquals(SINGLE_1, SINGLE_Z.join(SINGLE_1)); - assertEquals(SINGLE_U, SINGLE_0.join(SINGLE_U)); - assertEquals(SINGLE_X, SINGLE_X.join(SINGLE_Z)); - - // higher length - var result = BitVector.of(U, X, ZERO, ONE, Z).join(BitVector.of(ONE, ZERO, ZERO, ONE, Z)); - assertEquals(BitVector.of(U, X, ZERO, ONE, Z), result); - } - - @Test - void testAnd() - { - // binary - assertEquals(SINGLE_0, SINGLE_0.and(SINGLE_0)); - assertEquals(SINGLE_0, SINGLE_0.and(SINGLE_1)); - assertEquals(SINGLE_1, SINGLE_1.and(SINGLE_1)); - - // other - assertEquals(SINGLE_X, SINGLE_Z.and(SINGLE_1)); - assertEquals(SINGLE_0, SINGLE_0.and(SINGLE_U)); - assertEquals(SINGLE_X, SINGLE_X.and(SINGLE_Z)); - - // higher length - var result = BitVector.of(U, X, ZERO, ONE, ONE).and(BitVector.of(ONE, ONE, ZERO, ZERO, ONE)); - assertEquals(BitVector.of(U, X, ZERO, ZERO, ONE), result); - } - - @Test - void testOr() - { - // binary - assertEquals(SINGLE_0, SINGLE_0.or(SINGLE_0)); - assertEquals(SINGLE_1, SINGLE_0.or(SINGLE_1)); - assertEquals(SINGLE_1, SINGLE_1.or(SINGLE_1)); - - // other - assertEquals(SINGLE_1, SINGLE_Z.or(SINGLE_1)); - assertEquals(SINGLE_1, SINGLE_1.or(SINGLE_U)); - assertEquals(SINGLE_X, SINGLE_X.or(SINGLE_Z)); - - // higher length - var result = BitVector.of(U, X, ZERO, ONE, ZERO).or(BitVector.of(ZERO, ZERO, ZERO, ONE, ONE)); - assertEquals(BitVector.of(U, X, ZERO, ONE, ONE), result); - } - - @Test - void testXor() - { - // binary - assertEquals(SINGLE_0, SINGLE_0.xor(SINGLE_0)); - assertEquals(SINGLE_1, SINGLE_0.xor(SINGLE_1)); - assertEquals(SINGLE_0, SINGLE_1.xor(SINGLE_1)); - - // other - assertEquals(SINGLE_X, SINGLE_Z.xor(SINGLE_1)); - assertEquals(SINGLE_U, SINGLE_0.xor(SINGLE_U)); - assertEquals(SINGLE_X, SINGLE_X.xor(SINGLE_Z)); - - // higher length - var result = BitVector.of(U, X, ZERO, ONE, ONE).xor(BitVector.of(ONE, ZERO, ZERO, ZERO, ONE)); - assertEquals(BitVector.of(U, X, ZERO, ONE, ZERO), result); - } - - @Test - void testNot() - { - // binary - assertEquals(SINGLE_1, SINGLE_0.not()); - assertEquals(SINGLE_0, SINGLE_1.not()); - - // other - assertEquals(SINGLE_U, SINGLE_U.not()); - assertEquals(SINGLE_X, SINGLE_X.not()); - assertEquals(SINGLE_X, SINGLE_Z.not()); - - // higher length - var result = BitVector.of(U, X, ZERO, ONE, Z).not(); - assertEquals(BitVector.of(U, X, ONE, ZERO, X), result); - } - - @Test - void testLength() - { - assertEquals(0, BitVector.of().length()); - assertEquals(1, SINGLE_0.length()); - assertEquals(3, BitVector.of(X, X, Z).length()); - } - - @Test - void testConcat() - { - assertEquals(BitVector.of(U, X), SINGLE_U.concat(SINGLE_X)); - assertEquals(BitVector.of(Z, X, U, ONE, X), BitVector.of(Z, X, U).concat(BitVector.of(ONE, X))); - } - - @Test - void testSubVectorInt() - { - assertEquals(SINGLE_0, SINGLE_0.subVector(0)); - assertEquals(BitVector.of(), SINGLE_0.subVector(1)); - assertEquals(SINGLE_0, BitVector.of(ONE, ZERO).subVector(1)); - assertEquals(BitVector.of(X, Z), BitVector.of(ZERO, U, ONE, X, Z).subVector(3)); - } - - @Test - void testSubVectorIntInt() - { - assertEquals(SINGLE_0, SINGLE_0.subVector(0, 1)); - assertEquals(BitVector.of(), SINGLE_0.subVector(0, 0)); - assertEquals(SINGLE_0, BitVector.of(ONE, ZERO).subVector(1, 2)); - assertEquals(BitVector.of(ONE, X), BitVector.of(ZERO, U, ONE, X, Z).subVector(2, 4)); - } - - @Test - void testEqualsObject() - { - assertEquals(SINGLE_X, SINGLE_X); - assertNotEquals(SINGLE_0, SINGLE_1); - - assertEquals(BitVector.of(X, Z, U), BitVector.of(X, Z, U)); - assertNotEquals(BitVector.of(X, Z, U), BitVector.of(X, X, U)); - } - - @Test - void testEqualsWithOffset() - { - assertTrue(SINGLE_X.equalsWithOffset(SINGLE_X, 0)); - assertFalse(SINGLE_0.equalsWithOffset(SINGLE_1, 0)); - - assertTrue(BitVector.of(X, Z, U).equalsWithOffset(BitVector.of(Z, U), 1)); - assertFalse(BitVector.of(X, Z, U).equalsWithOffset(BitVector.of(X, U), 1)); - assertTrue(BitVector.of(X, Z, U).equalsWithOffset(BitVector.of(U), 2)); - } - - @Test - void testParse() - { - assertEquals(SINGLE_U, BitVector.parse("U")); - assertEquals(SINGLE_X, BitVector.parse("X")); - assertEquals(SINGLE_0, BitVector.parse("0")); - assertEquals(SINGLE_1, BitVector.parse("1")); - assertEquals(SINGLE_Z, BitVector.parse("Z")); - - assertEquals(BitVector.of(X, U, Z, ONE, ZERO), BitVector.parse("XUZ10")); - - assertThrows(RuntimeException.class, () -> BitVector.parse("01BX")); - } - - @Test - void testIterator() - { - var bv = BitVector.of(U, Z, ONE, ZERO, X); - Iterator it = bv.iterator(); - - assertEquals(U, it.next()); - assertEquals(Z, it.next()); - assertEquals(ONE, it.next()); - assertEquals(ZERO, it.next()); - assertEquals(X, it.next()); - assertFalse(it.hasNext()); - } -} diff --git a/net.mograsim.logic.model.am2900/.classpath b/net.mograsim.logic.model.am2900/.classpath deleted file mode 100644 index c8dbda91..00000000 --- a/net.mograsim.logic.model.am2900/.classpath +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/net.mograsim.logic.model.am2900/.gitignore b/net.mograsim.logic.model.am2900/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/net.mograsim.logic.model.am2900/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/net.mograsim.logic.model.am2900/.project b/net.mograsim.logic.model.am2900/.project deleted file mode 100644 index 494b451f..00000000 --- a/net.mograsim.logic.model.am2900/.project +++ /dev/null @@ -1,30 +0,0 @@ - - - net.mograsim.logic.model.am2900 - - - net.mograsim.logic.model - SWTZoomableCanvas - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/net.mograsim.logic.model.am2900/.settings/org.eclipse.core.resources.prefs b/net.mograsim.logic.model.am2900/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/net.mograsim.logic.model.am2900/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f8bd225a..00000000 --- a/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,456 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=info -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=info -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=140 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=140 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 8f2c0a47..00000000 --- a/net.mograsim.logic.model.am2900/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,63 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_MoGraSim -formatter_settings_version=16 -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/net.mograsim.logic.model.am2900/Am2904Testbench.json b/net.mograsim.logic.model.am2900/Am2904Testbench.json deleted file mode 100644 index c7bec19f..00000000 --- a/net.mograsim.logic.model.am2900/Am2904Testbench.json +++ /dev/null @@ -1,2341 +0,0 @@ -{ - "width": 0.0, - "height": 0.0, - "interfacePins": [], - "innerScale": 1.0, - "submodel": { - "components": [ - { - "id": "Am2904", - "name": "Am2904#0", - "pos": { - "x": 220.0, - "y": 175.0 - } - }, - { - "id": "BitDisplay", - "name": "BitDisplay#0", - "pos": { - "x": 391.0, - "y": 150.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#1", - "pos": { - "x": 391.0, - "y": 165.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#2", - "pos": { - "x": 391.0, - "y": 180.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#3", - "pos": { - "x": 391.0, - "y": 195.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#4", - "pos": { - "x": 365.0, - "y": 240.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#5", - "pos": { - "x": 365.0, - "y": 275.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#6", - "pos": { - "x": 365.0, - "y": 370.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#7", - "pos": { - "x": 365.0, - "y": 385.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#8", - "pos": { - "x": 365.0, - "y": 330.0 - }, - "params": 1 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#9", - "pos": { - "x": 365.0, - "y": 315.0 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#0", - "pos": { - "x": 255.0, - "y": 152.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#1", - "pos": { - "x": 170.0, - "y": 82.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#10", - "pos": { - "x": 160.0, - "y": 247.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#11", - "pos": { - "x": 160.0, - "y": 217.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#12", - "pos": { - "x": 160.0, - "y": 202.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#13", - "pos": { - "x": 60.0, - "y": 132.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#14", - "pos": { - "x": 165.0, - "y": 287.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#15", - "pos": { - "x": 140.0, - "y": 317.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#16", - "pos": { - "x": 140.0, - "y": 332.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#17", - "pos": { - "x": 140.0, - "y": 387.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#18", - "pos": { - "x": 140.0, - "y": 372.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#19", - "pos": { - "x": 140.0, - "y": 357.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#2", - "pos": { - "x": 170.0, - "y": 112.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#20", - "pos": { - "x": 140.0, - "y": 302.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#21", - "pos": { - "x": 55.0, - "y": 142.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#22", - "pos": { - "x": 60.0, - "y": 152.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#23", - "pos": { - "x": 60.0, - "y": 172.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#24", - "pos": { - "x": 55.0, - "y": 162.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#25", - "pos": { - "x": 55.0, - "y": 182.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#26", - "pos": { - "x": 60.0, - "y": 192.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#27", - "pos": { - "x": 60.0, - "y": 232.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#28", - "pos": { - "x": 55.0, - "y": 202.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#29", - "pos": { - "x": 55.0, - "y": 222.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#3", - "pos": { - "x": 55.0, - "y": 122.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#30", - "pos": { - "x": 60.0, - "y": 212.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#31", - "pos": { - "x": 55.0, - "y": 242.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#32", - "pos": { - "x": 300.0, - "y": 107.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#33", - "pos": { - "x": 300.0, - "y": 137.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#34", - "pos": { - "x": 300.0, - "y": 92.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#35", - "pos": { - "x": 300.0, - "y": 122.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#36", - "pos": { - "x": 300.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#37", - "pos": { - "x": 165.0, - "y": 270.0 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#38", - "pos": { - "x": 385.0, - "y": 220.0 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#4", - "pos": { - "x": 170.0, - "y": 127.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#5", - "pos": { - "x": 170.0, - "y": 142.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#6", - "pos": { - "x": 170.0, - "y": 157.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#7", - "pos": { - "x": 155.0, - "y": 172.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#8", - "pos": { - "x": 155.0, - "y": 187.5 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#9", - "pos": { - "x": 160.0, - "y": 232.5 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Merger#0", - "pos": { - "x": 85.0, - "y": 130.0 - }, - "params": { - "logicWidth": 13, - "orientation": "LEFT" - } - }, - { - "id": "TextComponent", - "name": "TextComponent#0", - "pos": { - "x": 140.0, - "y": 110.0 - }, - "params": "IZ" - }, - { - "id": "TextComponent", - "name": "TextComponent#1", - "pos": { - "x": 140.0, - "y": 125.0 - }, - "params": "IC" - }, - { - "id": "TextComponent", - "name": "TextComponent#10", - "pos": { - "x": 35.0, - "y": 240.0 - }, - "params": "I0" - }, - { - "id": "TextComponent", - "name": "TextComponent#11", - "pos": { - "x": 35.0, - "y": 120.0 - }, - "params": "I12" - }, - { - "id": "TextComponent", - "name": "TextComponent#12", - "pos": { - "x": 35.0, - "y": 220.0 - }, - "params": "I2" - }, - { - "id": "TextComponent", - "name": "TextComponent#13", - "pos": { - "x": 40.0, - "y": 190.0 - }, - "params": "I5" - }, - { - "id": "TextComponent", - "name": "TextComponent#14", - "pos": { - "x": 40.0, - "y": 230.0 - }, - "params": "I1" - }, - { - "id": "TextComponent", - "name": "TextComponent#15", - "pos": { - "x": 40.0, - "y": 210.0 - }, - "params": "I3" - }, - { - "id": "TextComponent", - "name": "TextComponent#16", - "pos": { - "x": 35.0, - "y": 200.0 - }, - "params": "I4" - }, - { - "id": "TextComponent", - "name": "TextComponent#17", - "pos": { - "x": 35.0, - "y": 180.0 - }, - "params": "I6" - }, - { - "id": "TextComponent", - "name": "TextComponent#18", - "pos": { - "x": 40.0, - "y": 170.0 - }, - "params": "I7" - }, - { - "id": "TextComponent", - "name": "TextComponent#19", - "pos": { - "x": 35.0, - "y": 160.0 - }, - "params": "I8" - }, - { - "id": "TextComponent", - "name": "TextComponent#2", - "pos": { - "x": 140.0, - "y": 140.0 - }, - "params": "IN" - }, - { - "id": "TextComponent", - "name": "TextComponent#20", - "pos": { - "x": 40.0, - "y": 150.0 - }, - "params": "I9" - }, - { - "id": "TextComponent", - "name": "TextComponent#21", - "pos": { - "x": 35.0, - "y": 140.0 - }, - "params": "I10" - }, - { - "id": "TextComponent", - "name": "TextComponent#22", - "pos": { - "x": 40.0, - "y": 130.0 - }, - "params": "I11" - }, - { - "id": "TextComponent", - "name": "TextComponent#23", - "pos": { - "x": 145.0, - "y": 285.0 - }, - "params": "CX" - }, - { - "id": "TextComponent", - "name": "TextComponent#24", - "pos": { - "x": 150.0, - "y": 80.0 - }, - "params": "C" - }, - { - "id": "TextComponent", - "name": "TextComponent#25", - "pos": { - "x": 225.0, - "y": 150.0 - }, - "params": "_OEY" - }, - { - "id": "TextComponent", - "name": "TextComponent#26", - "pos": { - "x": 416.0, - "y": 150.0 - }, - "params": "YZ" - }, - { - "id": "TextComponent", - "name": "TextComponent#27", - "pos": { - "x": 416.0, - "y": 165.0 - }, - "params": "YC" - }, - { - "id": "TextComponent", - "name": "TextComponent#28", - "pos": { - "x": 416.0, - "y": 180.0 - }, - "params": "YN" - }, - { - "id": "TextComponent", - "name": "TextComponent#29", - "pos": { - "x": 416.0, - "y": 195.0 - }, - "params": "YOVR" - }, - { - "id": "TextComponent", - "name": "TextComponent#3", - "pos": { - "x": 140.0, - "y": 155.0 - }, - "params": "IOVR" - }, - { - "id": "TextComponent", - "name": "TextComponent#30", - "pos": { - "x": 390.0, - "y": 240.0 - }, - "params": "CT" - }, - { - "id": "TextComponent", - "name": "TextComponent#31", - "pos": { - "x": 390.0, - "y": 275.0 - }, - "params": "C0" - }, - { - "id": "TextComponent", - "name": "TextComponent#32", - "pos": { - "x": 390.0, - "y": 315.0 - }, - "params": "SIOn" - }, - { - "id": "TextComponent", - "name": "TextComponent#33", - "pos": { - "x": 390.0, - "y": 330.0 - }, - "params": "QIOn" - }, - { - "id": "TextComponent", - "name": "TextComponent#34", - "pos": { - "x": 390.0, - "y": 370.0 - }, - "params": "SIO0" - }, - { - "id": "TextComponent", - "name": "TextComponent#35", - "pos": { - "x": 390.0, - "y": 385.0 - }, - "params": "QIO0" - }, - { - "id": "TextComponent", - "name": "TextComponent#36", - "pos": { - "x": 30.0, - "y": 300.0 - }, - "params": "enable S/QIOn input" - }, - { - "id": "TextComponent", - "name": "TextComponent#37", - "pos": { - "x": 30.0, - "y": 355.0 - }, - "params": "enable S/QIO0 input" - }, - { - "id": "TextComponent", - "name": "TextComponent#38", - "pos": { - "x": 110.0, - "y": 385.0 - }, - "params": "QIO0" - }, - { - "id": "TextComponent", - "name": "TextComponent#39", - "pos": { - "x": 110.0, - "y": 370.0 - }, - "params": "SIO0" - }, - { - "id": "TextComponent", - "name": "TextComponent#4", - "pos": { - "x": 115.0, - "y": 170.0 - }, - "params": "_CEM" - }, - { - "id": "TextComponent", - "name": "TextComponent#40", - "pos": { - "x": 110.0, - "y": 315.0 - }, - "params": "SIOn" - }, - { - "id": "TextComponent", - "name": "TextComponent#41", - "pos": { - "x": 110.0, - "y": 330.0 - }, - "params": "QIOn" - }, - { - "id": "TextComponent", - "name": "TextComponent#42", - "pos": { - "x": 270.0, - "y": 135.0 - }, - "params": "YOVR" - }, - { - "id": "TextComponent", - "name": "TextComponent#43", - "pos": { - "x": 270.0, - "y": 120.0 - }, - "params": "YN" - }, - { - "id": "TextComponent", - "name": "TextComponent#44", - "pos": { - "x": 270.0, - "y": 90.0 - }, - "params": "YZ" - }, - { - "id": "TextComponent", - "name": "TextComponent#45", - "pos": { - "x": 270.0, - "y": 105.0 - }, - "params": "YC" - }, - { - "id": "TextComponent", - "name": "TextComponent#46", - "pos": { - "x": 220.0, - "y": 75.0 - }, - "params": "enable Y input" - }, - { - "id": "TextComponent", - "name": "TextComponent#47", - "pos": { - "x": 145.0, - "y": 270.0 - }, - "params": "_SE" - }, - { - "id": "TextComponent", - "name": "TextComponent#48", - "pos": { - "x": 350.0, - "y": 220.0 - }, - "params": "_OECT" - }, - { - "id": "TextComponent", - "name": "TextComponent#5", - "pos": { - "x": 115.0, - "y": 185.0 - }, - "params": "_CEmu" - }, - { - "id": "TextComponent", - "name": "TextComponent#6", - "pos": { - "x": 125.0, - "y": 200.0 - }, - "params": "_EZ" - }, - { - "id": "TextComponent", - "name": "TextComponent#7", - "pos": { - "x": 125.0, - "y": 215.0 - }, - "params": "_EC" - }, - { - "id": "TextComponent", - "name": "TextComponent#8", - "pos": { - "x": 125.0, - "y": 230.0 - }, - "params": "_EN" - }, - { - "id": "TextComponent", - "name": "TextComponent#9", - "pos": { - "x": 125.0, - "y": 245.0 - }, - "params": "_EOVR" - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 175.0, - "y": 315.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#1", - "pos": { - "x": 175.0, - "y": 330.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#2", - "pos": { - "x": 175.0, - "y": 385.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#3", - "pos": { - "x": 175.0, - "y": 370.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#4", - "pos": { - "x": 335.0, - "y": 105.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#5", - "pos": { - "x": 335.0, - "y": 90.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#6", - "pos": { - "x": 335.0, - "y": 120.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#7", - "pos": { - "x": 335.0, - "y": 135.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 184.0, - "y": 364.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 184.0, - "y": 309.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 369.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 374.0, - "y": 189.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 379.0, - "y": 199.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 209.0, - "y": 324.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 214.0, - "y": 339.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 354.0, - "y": 379.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 359.0, - "y": 389.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 344.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 359.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 359.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 364.0, - "y": 159.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "ManualSwitch#0", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_OEY" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 280.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#1", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "C" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 215.0, - "y": 90.0 - }, - { - "x": 215.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_EOVR" - }, - "pin2": { - "compName": "ManualSwitch#10", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 205.0, - "y": 220.0 - }, - { - "x": 205.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#9", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EN" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 200.0, - "y": 240.0 - }, - { - "x": 200.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "I" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 105.0, - "y": 190.0 - }, - { - "x": 105.0, - "y": 265.0 - }, - { - "x": 210.0, - "y": 265.0 - }, - { - "x": 210.0, - "y": 235.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#14", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "Cx" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 200.0, - "y": 295.0 - }, - { - "x": 200.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "YOVR" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "YN" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 375.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#1", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "YZ" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 365.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "CT" - }, - "pin2": { - "compName": "BitDisplay#4", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 345.0, - "y": 235.0 - }, - { - "x": 345.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "C0" - }, - "pin2": { - "compName": "BitDisplay#5", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#2", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IZ" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 210.0, - "y": 120.0 - }, - { - "x": 210.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "SIOn" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 210.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "QIOn" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 215.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#1", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#15", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#16", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "IN" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "IN" - }, - "pin2": { - "compName": "ManualSwitch#17", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#18", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "IN" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "EN" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "IC" - }, - "pin2": { - "compName": "ManualSwitch#4", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 205.0, - "y": 190.0 - }, - { - "x": 205.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "EN" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 200.0, - "y": 365.0 - }, - { - "x": 200.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#20", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "EN" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 200.0, - "y": 310.0 - }, - { - "x": 200.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#9", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 210.0, - "y": 375.0 - }, - { - "x": 345.0, - "y": 375.0 - }, - { - "x": 345.0, - "y": 325.0 - } - ] - }, - { - "pin1": { - "compName": "BitDisplay#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 350.0, - "y": 340.0 - }, - { - "x": 350.0, - "y": 380.0 - }, - { - "x": 215.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#3", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [ - { - "x": 210.0, - "y": 380.0 - }, - { - "x": 210.0, - "y": 385.0 - }, - { - "x": 355.0, - "y": 385.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "OUT" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 210.0, - "y": 390.0 - }, - { - "x": 210.0, - "y": 395.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#7", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 360.0, - "y": 395.0 - } - ] - }, - { - "pin1": { - "compName": "BitDisplay#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#5", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IN" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 200.0, - "y": 150.0 - }, - { - "x": 200.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "SIO0" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 355.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "QIO0" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 360.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#3", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O12" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O11" - }, - "pin2": { - "compName": "ManualSwitch#13", - "pinName": "" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#21", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O10" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O9" - }, - "pin2": { - "compName": "ManualSwitch#22", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#24", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O8" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O7" - }, - "pin2": { - "compName": "ManualSwitch#23", - "pinName": "" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#25", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O6" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O5" - }, - "pin2": { - "compName": "ManualSwitch#26", - "pinName": "" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "IOVR" - }, - "pin2": { - "compName": "ManualSwitch#6", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 195.0, - "y": 200.0 - }, - { - "x": 195.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#28", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O4" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O3" - }, - "pin2": { - "compName": "ManualSwitch#30", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#29", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O2" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O1" - }, - "pin2": { - "compName": "ManualSwitch#27", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#31", - "pinName": "" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "O0" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#7", - "pinName": "IN" - }, - "pin2": { - "compName": "ManualSwitch#33", - "pinName": "" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#35", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#6", - "pinName": "IN" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#4", - "pinName": "IN" - }, - "pin2": { - "compName": "ManualSwitch#32", - "pinName": "" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#34", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "IN" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "EN" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "ManualSwitch#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_CEM" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 190.0, - "y": 180.0 - }, - { - "x": 190.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "ManualSwitch#36", - "pinName": "" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 360.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "EN" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#6", - "pinName": "EN" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#7", - "pinName": "EN" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#65", - "path": [ - { - "x": 360.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#0", - "pinName": "" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "OUT" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 365.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "YC" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 370.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "OUT" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 370.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_CEmu" - }, - "pin2": { - "compName": "ManualSwitch#8", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 185.0, - "y": 205.0 - }, - { - "x": 185.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#6", - "pinName": "OUT" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 375.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#2", - "pinName": "" - }, - "name": "unnamedWire#71", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#3", - "pinName": "" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 380.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#7", - "pinName": "OUT" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 380.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_SE" - }, - "pin2": { - "compName": "ManualSwitch#37", - "pinName": "" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 215.0, - "y": 260.0 - }, - { - "x": 215.0, - "y": 280.0 - } - ] - }, - { - "pin1": { - "compName": "ManualSwitch#38", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_OECT" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 410.0, - "y": 230.0 - }, - { - "x": 410.0, - "y": 215.0 - }, - { - "x": 345.0, - "y": 215.0 - }, - { - "x": 345.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_EZ" - }, - "pin2": { - "compName": "ManualSwitch#12", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_EC" - }, - "pin2": { - "compName": "ManualSwitch#11", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 195.0, - "y": 215.0 - }, - { - "x": 195.0, - "y": 225.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "default", - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF b/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF deleted file mode 100644 index 08b14e04..00000000 --- a/net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-SymbolicName: net.mograsim.logic.model.am2900;singleton:=true -Bundle-Version: 0.1.0.qualifier -Export-Package: net.mograsim.logic.model.am2900, - net.mograsim.logic.model.am2900.components, - net.mograsim.logic.model.am2900.components.am2901, - net.mograsim.logic.model.am2900.components.am2904, - net.mograsim.logic.model.am2900.components.am2910, - net.mograsim.logic.model.am2900.machine, - net.mograsim.logic.model.examples -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.osgi, - net.mograsim.machine;bundle-version="0.1.0";visibility:=reexport, - net.mograsim.logic.core -Automatic-Module-Name: net.mograsim.logic.model.am2900 -Bundle-Vendor: Mograsim Team -Bundle-Activator: net.mograsim.logic.model.am2900.Am2900Loader -Bundle-ActivationPolicy: lazy diff --git a/net.mograsim.logic.model.am2900/OSGI-INF/l10n/bundle.properties b/net.mograsim.logic.model.am2900/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 3fe36700..00000000 --- a/net.mograsim.logic.model.am2900/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for net.mograsim.logic.model.am2900 -Bundle-Vendor = Mograsim Team -Bundle-Name = Mograsim Am2900 logic \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/build.properties b/net.mograsim.logic.model.am2900/build.properties deleted file mode 100644 index 1eb041da..00000000 --- a/net.mograsim.logic.model.am2900/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - components/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/,\ - plugin.xml diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json deleted file mode 100644 index b97159cb..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ /dev/null @@ -1,6913 +0,0 @@ -{ - "width": 504.0, - "height": 342.0, - "interfacePins": [], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "ManualSwitch", - "name": "@bz_pc_cpol", - "pos": { - "x": 120.0, - "y": 435.0 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "@c", - "pos": { - "x": 120.0, - "y": 350.0 - }, - "params": 1 - }, - { - "id": "dlatch80", - "name": "@dlatch80#1", - "pos": { - "x": 295.0, - "y": 675.0 - } - }, - { - "id": "ManualSwitch", - "name": "@ireg_cpol", - "pos": { - "x": 120.0, - "y": 410.0 - }, - "params": 1 - }, - { - "id": "ManualSwitch", - "name": "@mireg_cpol", - "pos": { - "x": 120.0, - "y": 385.0 - }, - "params": 1 - }, - { - "id": "Am2900MainMemory", - "name": "Am2900MainMemory#0", - "pos": { - "x": 35.0, - "y": 30.0 - } - }, - { - "id": "Am2900MicroInstructionMemory", - "name": "Am2900MicroInstructionMemory#0", - "pos": { - "x": 65.0, - "y": 565.0 - } - }, - { - "id": "Am2901", - "name": "Am2901#0", - "pos": { - "x": 725.0, - "y": 400.0 - } - }, - { - "id": "Am2901", - "name": "Am2901#1", - "pos": { - "x": 850.0, - "y": 400.0 - } - }, - { - "id": "Am2901", - "name": "Am2901#2", - "pos": { - "x": 975.0, - "y": 400.0 - } - }, - { - "id": "Am2901", - "name": "Am2901#3", - "pos": { - "x": 1110.0, - "y": 400.0 - } - }, - { - "id": "Am2904", - "name": "Am2904#0", - "pos": { - "x": 550.0, - "y": 405.0 - } - }, - { - "id": "Am2910", - "name": "Am2910#0", - "pos": { - "x": 405.0, - "y": 510.0 - } - }, - { - "id": "BitDisplay", - "name": "BitDisplay#1", - "pos": { - "x": 255.0, - "y": 30.0 - }, - "params": 16 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#2", - "pos": { - "x": 255.0, - "y": 45.0 - }, - "params": 16 - }, - { - "id": "FixedOutput", - "name": "FixedOutput#0", - "pos": { - "x": 540.0, - "y": 270.0 - }, - "params": { - "bits": [ - "ZERO" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#1", - "pos": { - "x": 635.0, - "y": 380.0 - }, - "params": { - "bits": [ - "ZERO" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#2", - "pos": { - "x": 365.0, - "y": 505.0 - }, - "params": { - "bits": [ - "ONE" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#3", - "pos": { - "x": 455.0, - "y": 560.0 - }, - "params": { - "bits": [ - "ONE" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#4", - "pos": { - "x": 420.0, - "y": 570.0 - }, - "params": { - "bits": [ - "ZERO" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#5", - "pos": { - "x": 475.0, - "y": 505.0 - }, - "params": { - "bits": [ - "ZERO" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#6", - "pos": { - "x": 535.0, - "y": 370.0 - }, - "params": { - "bits": [ - "ZERO" - ] - } - }, - { - "id": "FixedOutput", - "name": "FixedOutput#7", - "pos": { - "x": 260.0, - "y": 370.0 - }, - "params": { - "bits": [ - null - ] - } - }, - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 395.0, - "y": 195.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 335.0, - "y": 165.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 395.0, - "y": 220.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 935.0, - "y": 685.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 935.0, - "y": 710.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 190.0, - "y": 100.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 240.0, - "y": 525.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 555.0, - "y": 115.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 620.0, - "y": 160.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#11", - "pos": { - "x": 575.0, - "y": 115.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#12", - "pos": { - "x": 575.0, - "y": 195.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#13", - "pos": { - "x": 575.0, - "y": 235.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#14", - "pos": { - "x": 675.0, - "y": 150.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#15", - "pos": { - "x": 675.0, - "y": 245.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#16", - "pos": { - "x": 345.0, - "y": 830.0 - }, - "params": { - "logicWidth": 80, - "orientation": "UP_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#17", - "pos": { - "x": 405.0, - "y": 815.0 - }, - "params": { - "logicWidth": 12, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#18", - "pos": { - "x": 525.0, - "y": 815.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#19", - "pos": { - "x": 660.0, - "y": 755.0 - }, - "params": { - "logicWidth": 13, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 620.0, - "y": 255.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#20", - "pos": { - "x": 575.0, - "y": 815.0 - }, - "params": { - "logicWidth": 6, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#21", - "pos": { - "x": 695.0, - "y": 815.0 - }, - "params": { - "logicWidth": 2, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#22", - "pos": { - "x": 655.0, - "y": 815.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#23", - "pos": { - "x": 730.0, - "y": 770.0 - }, - "params": { - "logicWidth": 6, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#24", - "pos": { - "x": 690.0, - "y": 770.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#25", - "pos": { - "x": 660.0, - "y": 770.0 - }, - "params": { - "logicWidth": 2, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#26", - "pos": { - "x": 925.0, - "y": 815.0 - }, - "params": { - "logicWidth": 16, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#27", - "pos": { - "x": 895.0, - "y": 815.0 - }, - "params": { - "logicWidth": 3, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#28", - "pos": { - "x": 865.0, - "y": 815.0 - }, - "params": { - "logicWidth": 3, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#29", - "pos": { - "x": 835.0, - "y": 815.0 - }, - "params": { - "logicWidth": 3, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 205.0, - "y": 390.0 - }, - "params": { - "logicWidth": 8, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#30", - "pos": { - "x": 795.0, - "y": 815.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#31", - "pos": { - "x": 745.0, - "y": 815.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#32", - "pos": { - "x": 895.0, - "y": 800.0 - }, - "params": { - "logicWidth": 3, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#33", - "pos": { - "x": 835.0, - "y": 800.0 - }, - "params": { - "logicWidth": 3, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#34", - "pos": { - "x": 865.0, - "y": 800.0 - }, - "params": { - "logicWidth": 3, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#35", - "pos": { - "x": 835.0, - "y": 780.0 - }, - "params": { - "logicWidth": 9, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#36", - "pos": { - "x": 895.0, - "y": 330.0 - }, - "params": { - "logicWidth": 16, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#37", - "pos": { - "x": 895.0, - "y": 580.0 - }, - "params": { - "logicWidth": 16, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#38", - "pos": { - "x": 895.0, - "y": 565.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#39", - "pos": { - "x": 935.0, - "y": 565.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 205.0, - "y": 405.0 - }, - "params": { - "logicWidth": 12, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#40", - "pos": { - "x": 975.0, - "y": 565.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#41", - "pos": { - "x": 1015.0, - "y": 565.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN" - } - }, - { - "id": "Splitter", - "name": "Splitter#42", - "pos": { - "x": 895.0, - "y": 345.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#43", - "pos": { - "x": 935.0, - "y": 345.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#44", - "pos": { - "x": 975.0, - "y": 345.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#45", - "pos": { - "x": 1015.0, - "y": 345.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#46", - "pos": { - "x": 310.0, - "y": 235.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#47", - "pos": { - "x": 620.0, - "y": 200.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#48", - "pos": { - "x": 365.0, - "y": 815.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN_ALT" - } - }, - { - "id": "Splitter", - "name": "Splitter#49", - "pos": { - "x": 620.0, - "y": 295.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "TextComponent", - "name": "TextComponent#0", - "pos": { - "x": 305.0, - "y": 30.0 - }, - "params": "D bus" - }, - { - "id": "TextComponent", - "name": "TextComponent#1", - "pos": { - "x": 305.0, - "y": 60.0 - }, - "params": "A bus" - }, - { - "id": "TextComponent", - "name": "TextComponent#13", - "pos": { - "x": 60.0, - "y": 385.0 - }, - "params": "mireg cpol" - }, - { - "id": "TextComponent", - "name": "TextComponent#14", - "pos": { - "x": 60.0, - "y": 415.0 - }, - "params": "ireg cpol" - }, - { - "id": "TextComponent", - "name": "TextComponent#15", - "pos": { - "x": 60.0, - "y": 435.0 - }, - "params": "bz/pc cpol" - }, - { - "id": "TextComponent", - "name": "TextComponent#3", - "pos": { - "x": 515.0, - "y": 110.0 - }, - "params": "asdf" - }, - { - "id": "TextComponent", - "name": "TextComponent#4", - "pos": { - "x": 60.0, - "y": 350.0 - }, - "params": "c" - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 990.0, - "y": 590.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#1", - "pos": { - "x": 990.0, - "y": 615.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#2", - "pos": { - "x": 425.0, - "y": 120.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#3", - "pos": { - "x": 425.0, - "y": 145.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#5", - "pos": { - "x": 205.0, - "y": 70.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 604.0, - "y": 364.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 714.0, - "y": 394.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 819.0, - "y": 384.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 824.0, - "y": 389.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 329.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 474.0, - "y": 44.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 419.0, - "y": 129.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 894.0, - "y": 44.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 844.0, - "y": 794.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 984.0, - "y": 599.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 249.0, - "y": 44.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 244.0, - "y": 59.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 839.0, - "y": 394.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 444.0, - "y": 364.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 389.0, - "y": 209.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 449.0, - "y": 44.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 454.0, - "y": 59.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 389.0, - "y": 224.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 929.0, - "y": 714.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 819.0, - "y": 529.0 - }, - "params": 9 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 944.0, - "y": 529.0 - }, - "params": 9 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 1069.0, - "y": 529.0 - }, - "params": 9 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#29", - "pos": { - "x": 244.0, - "y": 44.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 964.0, - "y": 394.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#30", - "pos": { - "x": 564.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#31", - "pos": { - "x": 569.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#32", - "pos": { - "x": 929.0, - "y": 699.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#33", - "pos": { - "x": 284.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#34", - "pos": { - "x": 294.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#35", - "pos": { - "x": 304.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#36", - "pos": { - "x": 339.0, - "y": 229.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#37", - "pos": { - "x": 824.0, - "y": 699.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#38", - "pos": { - "x": 234.0, - "y": 529.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#39", - "pos": { - "x": 234.0, - "y": 539.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 569.0, - "y": 234.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 559.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 1074.0, - "y": 389.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 1069.0, - "y": 384.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 944.0, - "y": 384.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 949.0, - "y": 389.0 - }, - "params": 4 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 860.0, - "y": 590.0 - } - }, - { - "id": "and", - "name": "and#1", - "pos": { - "x": 860.0, - "y": 610.0 - } - }, - { - "id": "and", - "name": "and#2", - "pos": { - "x": 905.0, - "y": 595.0 - } - }, - { - "id": "dff16", - "name": "dff16#0", - "pos": { - "x": 370.0, - "y": 105.0 - } - }, - { - "id": "dff16_invwe", - "name": "dff16_invwe#0", - "pos": { - "x": 490.0, - "y": 165.0 - } - }, - { - "id": "dlatch80", - "name": "dlatch80#0", - "pos": { - "x": 240.0, - "y": 675.0 - } - }, - { - "id": "inc", - "name": "inc#0", - "pos": { - "x": 315.0, - "y": 135.0 - }, - "params": 16 - }, - { - "id": "mux1_12", - "name": "mux1_12#0", - "pos": { - "x": 365.0, - "y": 420.0 - } - }, - { - "id": "mux1_16", - "name": "mux1_16#0", - "pos": { - "x": 255.0, - "y": 110.0 - } - }, - { - "id": "mux1_16", - "name": "mux1_16#1", - "pos": { - "x": 910.0, - "y": 215.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 635.0, - "y": 145.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#1", - "pos": { - "x": 635.0, - "y": 240.0 - } - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 145.0, - "y": 380.0 - } - }, - { - "id": "xor", - "name": "xor#1", - "pos": { - "x": 145.0, - "y": 405.0 - } - }, - { - "id": "xor", - "name": "xor#2", - "pos": { - "x": 145.0, - "y": 430.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Am2904#0", - "pinName": "CT" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "_CC" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 675.0, - "y": 460.0 - }, - { - "x": 675.0, - "y": 355.0 - }, - { - "x": 470.0, - "y": 355.0 - }, - { - "x": 470.0, - "y": 505.0 - }, - { - "x": 400.0, - "y": 505.0 - }, - { - "x": 400.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "Qn+3" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "Qn" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 835.0, - "y": 515.0 - }, - { - "x": 835.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "QIOn" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "Qn+3" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 540.0, - "y": 530.0 - }, - { - "x": 540.0, - "y": 660.0 - }, - { - "x": 1215.0, - "y": 660.0 - }, - { - "x": 1215.0, - "y": 515.0 - } - ] - }, - { - "pin1": { - "compName": "@mireg_cpol", - "pinName": "" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Am2900MicroInstructionMemory#0", - "pinName": "D" - }, - "pin2": { - "compName": "dlatch80#0", - "pinName": "D" - }, - "name": "unnamedWire#101", - "path": [ - { - "x": 205.0, - "y": 615.0 - }, - { - "x": 205.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "xor#1", - "pinName": "Y" - }, - "pin2": { - "compName": "dff16_invwe#0", - "pinName": "C" - }, - "name": "unnamedWire#102", - "path": [ - { - "x": 255.0, - "y": 310.0 - }, - { - "x": 480.0, - "y": 310.0 - }, - { - "x": 480.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#103", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#104", - "path": [ - { - "x": 390.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#46", - "pinName": "O2" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 320.0, - "y": 210.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "EN" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 450.0, - "y": 205.0 - }, - { - "x": 450.0, - "y": 140.0 - }, - { - "x": 435.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#107", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 390.0, - "y": 235.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#46", - "pinName": "O0" - }, - "pin2": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "name": "unnamedWire#109", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "IN" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "F3" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 525.0, - "y": 425.0 - }, - { - "x": 525.0, - "y": 645.0 - }, - { - "x": 1105.0, - "y": 645.0 - }, - { - "x": 1105.0, - "y": 455.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "EN" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 435.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#111", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 930.0, - "y": 725.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 760.0, - "y": 165.0 - }, - { - "x": 760.0, - "y": 385.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "I" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 755.0, - "y": 390.0 - }, - { - "x": 755.0, - "y": 260.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#116", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#117", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#118", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O37" - }, - "name": "unnamedWire#119", - "path": [ - { - "x": 830.0, - "y": 715.0 - }, - { - "x": 830.0, - "y": 810.0 - }, - { - "x": 715.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "F\u003d0" - }, - "pin2": { - "compName": "and#1", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 720.0, - "y": 445.0 - }, - { - "x": 720.0, - "y": 535.0 - }, - { - "x": 840.0, - "y": 535.0 - }, - { - "x": 840.0, - "y": 625.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "name": "unnamedWire#120", - "path": [ - { - "x": 1015.0, - "y": 720.0 - }, - { - "x": 1015.0, - "y": 610.0 - }, - { - "x": 1000.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#121", - "path": [ - { - "x": 340.0, - "y": 700.0 - }, - { - "x": 340.0, - "y": 285.0 - }, - { - "x": 180.0, - "y": 285.0 - }, - { - "x": 180.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#122", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#123", - "path": [ - { - "x": 930.0, - "y": 690.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#1", - "pinName": "EN" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "name": "unnamedWire#124", - "path": [ - { - "x": 1000.0, - "y": 695.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "Am2900MainMemory#0", - "pinName": "A" - }, - "name": "unnamedWire#125", - "path": [] - }, - { - "pin1": { - "compName": "Am2900MainMemory#0", - "pinName": "D" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "IN" - }, - "name": "unnamedWire#126", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#46", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "S" - }, - "name": "unnamedWire#127", - "path": [ - { - "x": 310.0, - "y": 225.0 - }, - { - "x": 240.0, - "y": 225.0 - }, - { - "x": 240.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "inc#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "D" - }, - "name": "unnamedWire#128", - "path": [ - { - "x": 335.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "inc#0", - "pinName": "A" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "Y" - }, - "name": "unnamedWire#129", - "path": [ - { - "x": 335.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#1", - "pinName": "F\u003d0" - }, - "pin2": { - "compName": "and#1", - "pinName": "A" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 845.0, - "y": 445.0 - }, - { - "x": 845.0, - "y": 615.0 - } - ] - }, - { - "pin1": { - "compName": "inc#0", - "pinName": "CI" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "name": "unnamedWire#130", - "path": [ - { - "x": 360.0, - "y": 145.0 - }, - { - "x": 360.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#131", - "path": [ - { - "x": 330.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#132", - "path": [] - }, - { - "pin1": { - "compName": "FixedOutput#7", - "pinName": "out" - }, - "pin2": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "name": "unnamedWire#133", - "path": [ - { - "x": 285.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "IN" - }, - "name": "unnamedWire#134", - "path": [ - { - "x": 420.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#5", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#135", - "path": [ - { - "x": 230.0, - "y": 80.0 - }, - { - "x": 230.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910#0", - "pinName": "_MAP" - }, - "pin2": { - "compName": "mux1_12#0", - "pinName": "S" - }, - "name": "unnamedWire#136", - "path": [ - { - "x": 420.0, - "y": 560.0 - }, - { - "x": 360.0, - "y": 560.0 - }, - { - "x": 360.0, - "y": 425.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "Q" - }, - "name": "unnamedWire#137", - "path": [] - }, - { - "pin1": { - "compName": "@dlatch80#1", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "I" - }, - "name": "unnamedWire#138", - "path": [ - { - "x": 330.0, - "y": 760.0 - }, - { - "x": 330.0, - "y": 845.0 - }, - { - "x": 740.0, - "y": 845.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O22" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "_CCEN" - }, - "name": "unnamedWire#139", - "path": [ - { - "x": 565.0, - "y": 735.0 - }, - { - "x": 395.0, - "y": 735.0 - }, - { - "x": 395.0, - "y": 525.0 - } - ] - }, - { - "pin1": { - "compName": "and#1", - "pinName": "Y" - }, - "pin2": { - "compName": "and#2", - "pinName": "B" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 900.0, - "y": 615.0 - }, - { - "x": 900.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O21" - }, - "name": "unnamedWire#140", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O20" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O2" - }, - "name": "unnamedWire#141", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O19" - }, - "name": "unnamedWire#142", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O18" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O0" - }, - "name": "unnamedWire#143", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "I" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "I" - }, - "name": "unnamedWire#144", - "path": [ - { - "x": 540.0, - "y": 730.0 - }, - { - "x": 400.0, - "y": 730.0 - }, - { - "x": 400.0, - "y": 535.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O17" - }, - "name": "unnamedWire#145", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O16" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O10" - }, - "name": "unnamedWire#146", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O15" - }, - "name": "unnamedWire#147", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O14" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O8" - }, - "name": "unnamedWire#148", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O13" - }, - "name": "unnamedWire#149", - "path": [] - }, - { - "pin1": { - "compName": "and#2", - "pinName": "A" - }, - "pin2": { - "compName": "and#0", - "pinName": "Y" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 900.0, - "y": 600.0 - }, - { - "x": 900.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O12" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O6" - }, - "name": "unnamedWire#150", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O11" - }, - "name": "unnamedWire#151", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O10" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O4" - }, - "name": "unnamedWire#152", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O9" - }, - "name": "unnamedWire#153", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O8" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O2" - }, - "name": "unnamedWire#154", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O7" - }, - "name": "unnamedWire#155", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O0" - }, - "name": "unnamedWire#156", - "path": [] - }, - { - "pin1": { - "compName": "mux1_12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "D" - }, - "name": "unnamedWire#157", - "path": [ - { - "x": 435.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_12#0", - "pinName": "I1" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "I" - }, - "name": "unnamedWire#158", - "path": [ - { - "x": 350.0, - "y": 480.0 - }, - { - "x": 350.0, - "y": 760.0 - }, - { - "x": 460.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "@dlatch80#1", - "pinName": "D" - }, - "pin2": { - "compName": "dlatch80#0", - "pinName": "Q" - }, - "name": "unnamedWire#159", - "path": [] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "B" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "F\u003d0" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 850.0, - "y": 605.0 - }, - { - "x": 850.0, - "y": 535.0 - }, - { - "x": 970.0, - "y": 535.0 - }, - { - "x": 970.0, - "y": 445.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#160", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#48", - "pinName": "O3" - }, - "name": "unnamedWire#161", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#46", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#48", - "pinName": "I" - }, - "name": "unnamedWire#162", - "path": [ - { - "x": 325.0, - "y": 640.0 - }, - { - "x": 380.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2900MicroInstructionMemory#0", - "pinName": "A" - }, - "name": "unnamedWire#163", - "path": [ - { - "x": 440.0, - "y": 565.0 - }, - { - "x": 205.0, - "y": 565.0 - }, - { - "x": 205.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O29" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_CEM" - }, - "name": "unnamedWire#164", - "path": [ - { - "x": 635.0, - "y": 780.0 - }, - { - "x": 505.0, - "y": 780.0 - }, - { - "x": 505.0, - "y": 400.0 - }, - { - "x": 555.0, - "y": 400.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O30" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_CEmu" - }, - "name": "unnamedWire#165", - "path": [ - { - "x": 645.0, - "y": 775.0 - }, - { - "x": 500.0, - "y": 775.0 - }, - { - "x": 500.0, - "y": 395.0 - }, - { - "x": 595.0, - "y": 395.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O23" - }, - "name": "unnamedWire#166", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O25" - }, - "name": "unnamedWire#167", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O24" - }, - "name": "unnamedWire#168", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O26" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O3" - }, - "name": "unnamedWire#169", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#3", - "pinName": "F\u003d0" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 1095.0, - "y": 445.0 - }, - { - "x": 1095.0, - "y": 540.0 - }, - { - "x": 855.0, - "y": 540.0 - }, - { - "x": 855.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O27" - }, - "name": "unnamedWire#170", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O28" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O5" - }, - "name": "unnamedWire#171", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#22", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O31" - }, - "name": "unnamedWire#172", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O32" - }, - "pin2": { - "compName": "Splitter#22", - "pinName": "O1" - }, - "name": "unnamedWire#173", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#22", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O33" - }, - "name": "unnamedWire#174", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O34" - }, - "pin2": { - "compName": "Splitter#22", - "pinName": "O3" - }, - "name": "unnamedWire#175", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O35" - }, - "name": "unnamedWire#176", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O36" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O1" - }, - "name": "unnamedWire#177", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#23", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "I" - }, - "name": "unnamedWire#178", - "path": [ - { - "x": 755.0, - "y": 785.0 - }, - { - "x": 600.0, - "y": 785.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#22", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#24", - "pinName": "I" - }, - "name": "unnamedWire#179", - "path": [ - { - "x": 670.0, - "y": 790.0 - }, - { - "x": 705.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "and#2", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IZ" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 945.0, - "y": 600.0 - }, - { - "x": 945.0, - "y": 635.0 - }, - { - "x": 515.0, - "y": 635.0 - }, - { - "x": 515.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#25", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "I" - }, - "name": "unnamedWire#180", - "path": [ - { - "x": 665.0, - "y": 800.0 - }, - { - "x": 700.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#23", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O0" - }, - "name": "unnamedWire#181", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#23", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O1" - }, - "name": "unnamedWire#182", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#23", - "pinName": "O2" - }, - "name": "unnamedWire#183", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#23", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O3" - }, - "name": "unnamedWire#184", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#23", - "pinName": "O4" - }, - "name": "unnamedWire#185", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#23", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O5" - }, - "name": "unnamedWire#186", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#24", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O6" - }, - "name": "unnamedWire#187", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#24", - "pinName": "O1" - }, - "name": "unnamedWire#188", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#24", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O8" - }, - "name": "unnamedWire#189", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#3", - "pinName": "OVR" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IOVR" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 1100.0, - "y": 450.0 - }, - { - "x": 1100.0, - "y": 650.0 - }, - { - "x": 530.0, - "y": 650.0 - }, - { - "x": 530.0, - "y": 430.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#24", - "pinName": "O3" - }, - "name": "unnamedWire#190", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#25", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O11" - }, - "name": "unnamedWire#191", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O12" - }, - "pin2": { - "compName": "Splitter#25", - "pinName": "O1" - }, - "name": "unnamedWire#192", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O73" - }, - "name": "unnamedWire#193", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O72" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O14" - }, - "name": "unnamedWire#194", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O71" - }, - "name": "unnamedWire#195", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O70" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O12" - }, - "name": "unnamedWire#196", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O69" - }, - "name": "unnamedWire#197", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O68" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O10" - }, - "name": "unnamedWire#198", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O67" - }, - "name": "unnamedWire#199", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "RAMn+3" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "RAMn" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 830.0, - "y": 510.0 - }, - { - "x": 830.0, - "y": 410.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#3", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IC" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 1220.0, - "y": 520.0 - }, - { - "x": 1220.0, - "y": 640.0 - }, - { - "x": 520.0, - "y": 640.0 - }, - { - "x": 520.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O66" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O8" - }, - "name": "unnamedWire#200", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O65" - }, - "name": "unnamedWire#201", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O64" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O6" - }, - "name": "unnamedWire#202", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O63" - }, - "name": "unnamedWire#203", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O62" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O4" - }, - "name": "unnamedWire#204", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O61" - }, - "name": "unnamedWire#205", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O60" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O2" - }, - "name": "unnamedWire#206", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O59" - }, - "name": "unnamedWire#207", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O58" - }, - "pin2": { - "compName": "Splitter#26", - "pinName": "O0" - }, - "name": "unnamedWire#208", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#27", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O57" - }, - "name": "unnamedWire#209", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "Cn" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 840.0, - "y": 520.0 - }, - { - "x": 840.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O56" - }, - "pin2": { - "compName": "Splitter#27", - "pinName": "O1" - }, - "name": "unnamedWire#210", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#27", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O55" - }, - "name": "unnamedWire#211", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O54" - }, - "pin2": { - "compName": "Splitter#28", - "pinName": "O2" - }, - "name": "unnamedWire#212", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#28", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O53" - }, - "name": "unnamedWire#213", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O52" - }, - "pin2": { - "compName": "Splitter#28", - "pinName": "O0" - }, - "name": "unnamedWire#214", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#29", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O51" - }, - "name": "unnamedWire#215", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O50" - }, - "pin2": { - "compName": "Splitter#29", - "pinName": "O1" - }, - "name": "unnamedWire#216", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#29", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O49" - }, - "name": "unnamedWire#217", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#30", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O48" - }, - "name": "unnamedWire#218", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O47" - }, - "pin2": { - "compName": "Splitter#30", - "pinName": "O2" - }, - "name": "unnamedWire#219", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#1", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "Cn" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 965.0, - "y": 520.0 - }, - { - "x": 965.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#30", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O46" - }, - "name": "unnamedWire#220", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O45" - }, - "pin2": { - "compName": "Splitter#30", - "pinName": "O0" - }, - "name": "unnamedWire#221", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#31", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O40" - }, - "name": "unnamedWire#222", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O41" - }, - "pin2": { - "compName": "Splitter#31", - "pinName": "O1" - }, - "name": "unnamedWire#223", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#31", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O42" - }, - "name": "unnamedWire#224", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O43" - }, - "pin2": { - "compName": "Splitter#31", - "pinName": "O3" - }, - "name": "unnamedWire#225", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O10" - }, - "name": "unnamedWire#226", - "path": [ - { - "x": 680.0, - "y": 795.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#33", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#29", - "pinName": "I" - }, - "name": "unnamedWire#227", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#34", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#28", - "pinName": "I" - }, - "name": "unnamedWire#228", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#32", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#27", - "pinName": "I" - }, - "name": "unnamedWire#229", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#2", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "Cn" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 1090.0, - "y": 520.0 - }, - { - "x": 1090.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#32", - "pinName": "O0" - }, - "name": "unnamedWire#230", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#32", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#35", - "pinName": "O1" - }, - "name": "unnamedWire#231", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#32", - "pinName": "O2" - }, - "name": "unnamedWire#232", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#34", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#35", - "pinName": "O3" - }, - "name": "unnamedWire#233", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#34", - "pinName": "O1" - }, - "name": "unnamedWire#234", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#34", - "pinName": "O2" - }, - "name": "unnamedWire#235", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#33", - "pinName": "O0" - }, - "name": "unnamedWire#236", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#33", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#237", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#35", - "pinName": "O8" - }, - "pin2": { - "compName": "Splitter#33", - "pinName": "O2" - }, - "name": "unnamedWire#238", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#35", - "pinName": "O7" - }, - "name": "unnamedWire#239", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "I" - }, - "name": "unnamedWire#240", - "path": [ - { - "x": 720.0, - "y": 730.0 - }, - { - "x": 545.0, - "y": 730.0 - }, - { - "x": 545.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "Am2900MainMemory#0", - "pinName": "RW" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O0" - }, - "name": "unnamedWire#241", - "path": [ - { - "x": 175.0, - "y": 100.0 - }, - { - "x": 175.0, - "y": 290.0 - }, - { - "x": 345.0, - "y": 290.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "I" - }, - "name": "unnamedWire#242", - "path": [ - { - "x": 590.0, - "y": 150.0 - }, - { - "x": 590.0, - "y": 335.0 - }, - { - "x": 240.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#42", - "pinName": "O3" - }, - "name": "unnamedWire#243", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#42", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O14" - }, - "name": "unnamedWire#244", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#42", - "pinName": "O1" - }, - "name": "unnamedWire#245", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#42", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O12" - }, - "name": "unnamedWire#246", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#43", - "pinName": "O3" - }, - "name": "unnamedWire#247", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#43", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O10" - }, - "name": "unnamedWire#248", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#43", - "pinName": "O1" - }, - "name": "unnamedWire#249", - "path": [] - }, - { - "pin1": { - "compName": "@c", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#43", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O8" - }, - "name": "unnamedWire#250", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#44", - "pinName": "O3" - }, - "name": "unnamedWire#251", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#44", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O6" - }, - "name": "unnamedWire#252", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#44", - "pinName": "O1" - }, - "name": "unnamedWire#253", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#44", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O4" - }, - "name": "unnamedWire#254", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#45", - "pinName": "O3" - }, - "name": "unnamedWire#255", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#45", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O2" - }, - "name": "unnamedWire#256", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#36", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#45", - "pinName": "O1" - }, - "name": "unnamedWire#257", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#45", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "O0" - }, - "name": "unnamedWire#258", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#38", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O15" - }, - "name": "unnamedWire#259", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "C" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 1090.0, - "y": 395.0 - }, - { - "x": 1090.0, - "y": 495.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O14" - }, - "pin2": { - "compName": "Splitter#38", - "pinName": "O2" - }, - "name": "unnamedWire#260", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#38", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O13" - }, - "name": "unnamedWire#261", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O12" - }, - "pin2": { - "compName": "Splitter#38", - "pinName": "O0" - }, - "name": "unnamedWire#262", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#39", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O11" - }, - "name": "unnamedWire#263", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O10" - }, - "pin2": { - "compName": "Splitter#39", - "pinName": "O2" - }, - "name": "unnamedWire#264", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#39", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O9" - }, - "name": "unnamedWire#265", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O8" - }, - "pin2": { - "compName": "Splitter#39", - "pinName": "O0" - }, - "name": "unnamedWire#266", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#40", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O7" - }, - "name": "unnamedWire#267", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#40", - "pinName": "O2" - }, - "name": "unnamedWire#268", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#40", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O5" - }, - "name": "unnamedWire#269", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#2", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 965.0, - "y": 495.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#40", - "pinName": "O0" - }, - "name": "unnamedWire#270", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#41", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O3" - }, - "name": "unnamedWire#271", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#41", - "pinName": "O2" - }, - "name": "unnamedWire#272", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#41", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#37", - "pinName": "O1" - }, - "name": "unnamedWire#273", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#41", - "pinName": "O0" - }, - "name": "unnamedWire#274", - "path": [] - }, - { - "pin1": { - "compName": "mux1_16#1", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#36", - "pinName": "I" - }, - "name": "unnamedWire#275", - "path": [ - { - "x": 970.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_16#1", - "pinName": "S" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O74" - }, - "name": "unnamedWire#276", - "path": [ - { - "x": 905.0, - "y": 220.0 - }, - { - "x": 905.0, - "y": 210.0 - }, - { - "x": 1230.0, - "y": 210.0 - }, - { - "x": 1230.0, - "y": 760.0 - }, - { - "x": 1085.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#26", - "pinName": "I" - }, - "pin2": { - "compName": "mux1_16#1", - "pinName": "I0" - }, - "name": "unnamedWire#277", - "path": [ - { - "x": 1000.0, - "y": 740.0 - }, - { - "x": 1235.0, - "y": 740.0 - }, - { - "x": 1235.0, - "y": 205.0 - }, - { - "x": 900.0, - "y": 205.0 - }, - { - "x": 900.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#37", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#278", - "path": [ - { - "x": 970.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "name": "unnamedWire#279", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#1", - "pinName": "IN" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#280", - "path": [ - { - "x": 985.0, - "y": 625.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "IN" - }, - "name": "unnamedWire#281", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I1" - }, - "name": "unnamedWire#282", - "path": [ - { - "x": 420.0, - "y": 95.0 - }, - { - "x": 245.0, - "y": 95.0 - }, - { - "x": 245.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#283", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "name": "unnamedWire#284", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#285", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "name": "unnamedWire#286", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#287", - "path": [ - { - "x": 450.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "OUT" - }, - "name": "unnamedWire#288", - "path": [ - { - "x": 455.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "dff16_invwe#0", - "pinName": "D" - }, - "name": "unnamedWire#289", - "path": [ - { - "x": 475.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#1", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 840.0, - "y": 495.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#46", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#290", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O1" - }, - "pin2": { - "compName": "dff16_invwe#0", - "pinName": "_WE" - }, - "name": "unnamedWire#291", - "path": [ - { - "x": 355.0, - "y": 285.0 - }, - { - "x": 485.0, - "y": 285.0 - }, - { - "x": 485.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "name": "unnamedWire#292", - "path": [ - { - "x": 315.0, - "y": 400.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "name": "unnamedWire#293", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "name": "unnamedWire#294", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "name": "unnamedWire#295", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#48", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O4" - }, - "name": "unnamedWire#296", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#48", - "pinName": "O1" - }, - "name": "unnamedWire#297", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#48", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O2" - }, - "name": "unnamedWire#298", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O11" - }, - "name": "unnamedWire#299", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#1", - "pinName": "Qn+3" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "Qn" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 960.0, - "y": 515.0 - }, - { - "x": 960.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O10" - }, - "name": "unnamedWire#300", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O9" - }, - "name": "unnamedWire#301", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#47", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#302", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "pin2": { - "compName": "Splitter#47", - "pinName": "O2" - }, - "name": "unnamedWire#303", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#47", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#304", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "pin2": { - "compName": "Splitter#47", - "pinName": "O0" - }, - "name": "unnamedWire#305", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#49", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_1" - }, - "name": "unnamedWire#306", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_2" - }, - "pin2": { - "compName": "Splitter#49", - "pinName": "O2" - }, - "name": "unnamedWire#307", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#49", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_3" - }, - "name": "unnamedWire#308", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_4" - }, - "pin2": { - "compName": "Splitter#49", - "pinName": "O0" - }, - "name": "unnamedWire#309", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#0", - "pinName": "C" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 715.0, - "y": 495.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#47", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#30", - "pinName": "I" - }, - "name": "unnamedWire#310", - "path": [ - { - "x": 600.0, - "y": 215.0 - }, - { - "x": 600.0, - "y": 335.0 - }, - { - "x": 690.0, - "y": 335.0 - }, - { - "x": 690.0, - "y": 675.0 - }, - { - "x": 810.0, - "y": 675.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#31", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#49", - "pinName": "I" - }, - "name": "unnamedWire#311", - "path": [ - { - "x": 760.0, - "y": 785.0 - }, - { - "x": 800.0, - "y": 785.0 - }, - { - "x": 800.0, - "y": 685.0 - }, - { - "x": 700.0, - "y": 685.0 - }, - { - "x": 700.0, - "y": 345.0 - }, - { - "x": 610.0, - "y": 345.0 - }, - { - "x": 610.0, - "y": 310.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O44" - }, - "name": "unnamedWire#312", - "path": [ - { - "x": 605.0, - "y": 150.0 - }, - { - "x": 605.0, - "y": 340.0 - }, - { - "x": 695.0, - "y": 340.0 - }, - { - "x": 695.0, - "y": 680.0 - }, - { - "x": 805.0, - "y": 680.0 - }, - { - "x": 805.0, - "y": 800.0 - }, - { - "x": 785.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "S0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O39" - }, - "name": "unnamedWire#313", - "path": [ - { - "x": 615.0, - "y": 245.0 - }, - { - "x": 615.0, - "y": 350.0 - }, - { - "x": 705.0, - "y": 350.0 - }, - { - "x": 705.0, - "y": 690.0 - }, - { - "x": 795.0, - "y": 690.0 - }, - { - "x": 795.0, - "y": 790.0 - }, - { - "x": 735.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#35", - "pinName": "I" - }, - "name": "unnamedWire#314", - "path": [ - { - "x": 820.0, - "y": 735.0 - }, - { - "x": 875.0, - "y": 735.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#315", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "name": "unnamedWire#316", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#0", - "pinName": "I" - }, - "name": "unnamedWire#317", - "path": [ - { - "x": 820.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "I" - }, - "name": "unnamedWire#318", - "path": [ - { - "x": 945.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "I" - }, - "name": "unnamedWire#319", - "path": [ - { - "x": 1070.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 715.0, - "y": 365.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "I" - }, - "name": "unnamedWire#320", - "path": [ - { - "x": 1205.0, - "y": 530.0 - }, - { - "x": 1205.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#38", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "Y" - }, - "name": "unnamedWire#321", - "path": [ - { - "x": 910.0, - "y": 545.0 - }, - { - "x": 1185.0, - "y": 545.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#39", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "Y" - }, - "name": "unnamedWire#322", - "path": [ - { - "x": 950.0, - "y": 550.0 - }, - { - "x": 1050.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#40", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "Y" - }, - "name": "unnamedWire#323", - "path": [ - { - "x": 990.0, - "y": 555.0 - }, - { - "x": 925.0, - "y": 555.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#41", - "pinName": "I" - }, - "name": "unnamedWire#324", - "path": [ - { - "x": 800.0, - "y": 560.0 - }, - { - "x": 1030.0, - "y": 560.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#45", - "pinName": "I" - }, - "name": "unnamedWire#325", - "path": [ - { - "x": 785.0, - "y": 375.0 - }, - { - "x": 1030.0, - "y": 375.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#44", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "D" - }, - "name": "unnamedWire#326", - "path": [ - { - "x": 990.0, - "y": 370.0 - }, - { - "x": 910.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#43", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "D" - }, - "name": "unnamedWire#327", - "path": [ - { - "x": 950.0, - "y": 365.0 - }, - { - "x": 1035.0, - "y": 365.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#42", - "pinName": "I" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "D" - }, - "name": "unnamedWire#328", - "path": [ - { - "x": 910.0, - "y": 360.0 - }, - { - "x": 1170.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#329", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "Cn" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "C0" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 675.0, - "y": 505.0 - }, - { - "x": 675.0, - "y": 490.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I0" - }, - "name": "unnamedWire#330", - "path": [ - { - "x": 250.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O8" - }, - "name": "unnamedWire#331", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#1", - "pinName": "" - }, - "name": "unnamedWire#332", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "BitDisplay#2", - "pinName": "" - }, - "name": "unnamedWire#333", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#334", - "path": [ - { - "x": 340.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#335", - "path": [ - { - "x": 185.0, - "y": 230.0 - }, - { - "x": 185.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "name": "unnamedWire#336", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O7" - }, - "name": "unnamedWire#337", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "name": "unnamedWire#338", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#339", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "C" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 445.0, - "y": 365.0981951658187 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O6" - }, - "name": "unnamedWire#340", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O5" - }, - "name": "unnamedWire#341", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O4" - }, - "name": "unnamedWire#342", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "mux1_12#0", - "pinName": "I0" - }, - "name": "unnamedWire#343", - "path": [ - { - "x": 260.0, - "y": 440.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#5", - "pinName": "EN" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "name": "unnamedWire#344", - "path": [ - { - "x": 215.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O38" - }, - "pin2": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "name": "unnamedWire#345", - "path": [ - { - "x": 725.0, - "y": 805.0 - }, - { - "x": 825.0, - "y": 805.0 - } - ] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "name": "unnamedWire#346", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "name": "unnamedWire#347", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "dlatch80#0", - "pinName": "E" - }, - "name": "unnamedWire#348", - "path": [ - { - "x": 235.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#349", - "path": [] - }, - { - "pin1": { - "compName": "FixedOutput#1", - "pinName": "out" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_OECT" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 660.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#350", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "@dlatch80#1", - "pinName": "E" - }, - "name": "unnamedWire#351", - "path": [ - { - "x": 290.0, - "y": 535.0 - }, - { - "x": 290.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "FixedOutput#2", - "pinName": "out" - }, - "pin2": { - "compName": "Am2910#0", - "pinName": "_RLD" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "Am2910#0", - "pinName": "CI" - }, - "pin2": { - "compName": "FixedOutput#3", - "pinName": "out" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 480.0, - "y": 540.0 - }, - { - "x": 480.0, - "y": 570.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910#0", - "pinName": "_OE" - }, - "pin2": { - "compName": "FixedOutput#4", - "pinName": "out" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 445.0, - "y": 580.0 - } - ] - }, - { - "pin1": { - "compName": "FixedOutput#5", - "pinName": "out" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_SE" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#2", - "pinName": "RAMn" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "RAMn+3" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 955.0, - "y": 410.0 - }, - { - "x": 955.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "FixedOutput#6", - "pinName": "out" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 560.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_EZ" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EOVR" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 575.0, - "y": 400.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EC" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EN" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "dff16_invwe#0", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O7" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O14" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O5" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#3", - "pinName": "RAMn" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "RAMn+3" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 1080.0, - "y": 410.0 - }, - { - "x": 1080.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O3" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O2" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O0" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "FixedOutput#0", - "pinName": "out" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#54", - "path": [ - { - "x": 570.0, - "y": 280.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O3" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 570.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O3" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O1" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#2", - "pinName": "Qn+3" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "Qn" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 1085.0, - "y": 515.0 - }, - { - "x": 1085.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O1" - }, - "name": "unnamedWire#61", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_1" - }, - "name": "unnamedWire#67", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_2" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_3" - }, - "name": "unnamedWire#69", - "path": [] - }, - { - "pin1": { - "compName": "Am2901#0", - "pinName": "Qn" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "QIO0" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 685.0, - "y": 420.0 - }, - { - "x": 685.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_4" - }, - "name": "unnamedWire#70", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 610.0, - "y": 250.0 - }, - { - "x": 610.0, - "y": 270.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 610.0, - "y": 210.0 - }, - { - "x": 610.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O3" - }, - "name": "unnamedWire#73", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#74", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O1" - }, - "name": "unnamedWire#75", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O3" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y2" - }, - "name": "unnamedWire#78", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O1" - }, - "name": "unnamedWire#79", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "SIO0" - }, - "pin2": { - "compName": "Am2901#0", - "pinName": "RAMn" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 680.0, - "y": 525.0 - }, - { - "x": 680.0, - "y": 410.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y4" - }, - "name": "unnamedWire#80", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#0", - "pinName": "A" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 820.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#0", - "pinName": "B" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 825.0, - "y": 435.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "A" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 945.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#1", - "pinName": "B" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 950.0, - "y": 435.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "A" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 1070.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#2", - "pinName": "B" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 1075.0, - "y": 435.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "A" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 1205.0, - "y": 385.0 - }, - { - "x": 1205.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901#3", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 1210.0, - "y": 435.0 - }, - { - "x": 1210.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "SIOn" - }, - "pin2": { - "compName": "Am2901#3", - "pinName": "RAMn+3" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 535.0, - "y": 525.0 - }, - { - "x": 535.0, - "y": 655.0 - }, - { - "x": 1210.0, - "y": 655.0 - }, - { - "x": 1210.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "OUT" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 1245.0, - "y": 60.0 - }, - { - "x": 1245.0, - "y": 625.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "mux1_16#1", - "pinName": "I1" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 895.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 1240.0, - "y": 45.0 - }, - { - "x": 1240.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "xor#2", - "pinName": "Y" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "C" - }, - "name": "unnamedWire#94", - "path": [ - { - "x": 245.0, - "y": 270.0 - }, - { - "x": 365.0, - "y": 270.0 - }, - { - "x": 365.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "@bz_pc_cpol", - "pinName": "" - }, - "pin2": { - "compName": "xor#2", - "pinName": "B" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "@c", - "pinName": "" - }, - "pin2": { - "compName": "xor#2", - "pinName": "A" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "xor#1", - "pinName": "B" - }, - "pin2": { - "compName": "@ireg_cpol", - "pinName": "" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "xor#1", - "pinName": "A" - }, - "pin2": { - "compName": "@c", - "pinName": "" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "A" - }, - "pin2": { - "compName": "@c", - "pinName": "" - }, - "name": "unnamedWire#99", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2900", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json deleted file mode 100644 index 7a0b4b2c..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "_Q", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "_R", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "_S", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 7.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 40.0, - "y": 12.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 34.0, - "y": 16.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 64.0, - "y": 36.5 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_Q" - }, - "name": "_q", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "q", - "path": [ - { - "x": 35.0, - "y": 17.5 - }, - { - "x": 35.0, - "y": 7.5 - }, - { - "x": 65.0, - "y": 7.5 - }, - { - "x": 65.0, - "y": 12.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_S" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_R" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 35.0, - "y": 37.5 - }, - { - "x": 35.0, - "y": 27.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 65.0, - "y": 22.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 65.0, - "y": 42.5 - }, - { - "x": 5.0, - "y": 42.5 - }, - { - "x": 5.0, - "y": 22.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "_rsLatch", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "wireForcing", - "params": { - "wiresToForce": [ - "q" - ], - "wiresToForceInverted": [ - "_q" - ] - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json deleted file mode 100644 index 270afa21..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ /dev/null @@ -1,4003 +0,0 @@ -{ - "width": 90.0, - "height": 125.0, - "interfacePins": [ - { - "location": { - "x": 90.0, - "y": 15.0 - }, - "name": "A", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 90.0, - "y": 35.0 - }, - "name": "B", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 105.0 - }, - "name": "Cn", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 90.0, - "y": 120.0 - }, - "name": "Cn+4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 0.0 - }, - "name": "D", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "F3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "F\u003d0", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 90.0, - "y": 80.0 - }, - "name": "I", - "logicWidth": 9, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "OVR", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "Qn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 90.0, - "y": 115.0 - }, - "name": "Qn+3", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "RAMn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 90.0, - "y": 110.0 - }, - "name": "RAMn+3", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 75.0, - "y": 125.0 - }, - "name": "Y", - "logicWidth": 4, - "usage": "INPUT" - } - ], - "innerScale": 0.1, - "submodel": { - "components": [ - { - "id": "Am2901ALUInclSourceDecodeInclFunctionDecode", - "name": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pos": { - "x": 510.0, - "y": 620.0 - } - }, - { - "id": "Am2901DestDecode", - "name": "Am2901DestDecode#0", - "pos": { - "x": 380.0, - "y": 160.0 - } - }, - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 465.0, - "y": 190.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 420.0, - "y": 440.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 855.0, - "y": 760.0 - }, - "params": { - "logicWidth": 9, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 735.0, - "y": 1235.0 - }, - "params": { - "logicWidth": 4, - "orientation": "UP" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 670.0, - "y": 135.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 670.0, - "y": 335.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", - "pos": { - "x": 475.0, - "y": 615.0 - }, - "params": { - "logicWidth": 4, - "orientation": "DOWN" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 355.0, - "y": 920.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#1", - "pos": { - "x": 370.0, - "y": 850.0 - }, - "params": { - "logicWidth": 1, - "orientation": "DOWN" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#2", - "pos": { - "x": 400.0, - "y": 950.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#3", - "pos": { - "x": 400.0, - "y": 725.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 14.0, - "y": 714.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 459.0, - "y": 194.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 239.0, - "y": 929.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 244.0, - "y": 939.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 249.0, - "y": 949.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 254.0, - "y": 959.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 319.0, - "y": 929.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 334.0, - "y": 959.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 134.0, - "y": 1039.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 139.0, - "y": 1049.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 379.0, - "y": 529.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 394.0, - "y": 544.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 254.0, - "y": 749.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 434.0, - "y": 734.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 354.0, - "y": 504.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 359.0, - "y": 509.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 364.0, - "y": 514.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 369.0, - "y": 519.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 354.0, - "y": 449.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 359.0, - "y": 459.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 364.0, - "y": 469.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 369.0, - "y": 479.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#29", - "pos": { - "x": 104.0, - "y": 769.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 134.0, - "y": 729.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#30", - "pos": { - "x": 109.0, - "y": 779.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#31", - "pos": { - "x": 114.0, - "y": 789.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#32", - "pos": { - "x": 109.0, - "y": 809.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#33", - "pos": { - "x": 114.0, - "y": 819.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#34", - "pos": { - "x": 119.0, - "y": 829.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#35", - "pos": { - "x": 104.0, - "y": 799.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#36", - "pos": { - "x": 109.0, - "y": 839.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#37", - "pos": { - "x": 114.0, - "y": 849.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#38", - "pos": { - "x": 119.0, - "y": 859.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#39", - "pos": { - "x": 414.0, - "y": 449.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 129.0, - "y": 739.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#40", - "pos": { - "x": 99.0, - "y": 964.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#41", - "pos": { - "x": 99.0, - "y": 764.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#42", - "pos": { - "x": 124.0, - "y": 889.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#43", - "pos": { - "x": 364.0, - "y": 889.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#44", - "pos": { - "x": 134.0, - "y": 894.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#45", - "pos": { - "x": 409.0, - "y": 894.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#46", - "pos": { - "x": 424.0, - "y": 1079.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 124.0, - "y": 749.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 349.0, - "y": 364.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 344.0, - "y": 374.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 339.0, - "y": 384.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 334.0, - "y": 394.0 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 495.0, - "y": 180.0 - } - }, - { - "id": "dff4", - "name": "dff4#0", - "pos": { - "x": 200.0, - "y": 925.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#0", - "pos": { - "x": 720.0, - "y": 170.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#1", - "pos": { - "x": 260.0, - "y": 690.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 500.0, - "y": 350.0 - } - }, - { - "id": "or4", - "name": "or4#0", - "pos": { - "x": 375.0, - "y": 445.0 - } - }, - { - "id": "ram4", - "name": "ram4#0", - "pos": { - "x": 655.0, - "y": 170.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#0", - "pos": { - "x": 145.0, - "y": 725.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#1", - "pos": { - "x": 150.0, - "y": 925.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I6" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 845.0, - "y": 780.0 - }, - { - "x": 845.0, - "y": 305.0 - }, - { - "x": 375.0, - "y": 305.0 - }, - { - "x": 375.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I5" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 805.0, - "y": 790.0 - }, - { - "x": 805.0, - "y": 615.0 - }, - { - "x": 585.0, - "y": 615.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 15.0, - "y": 90.0 - }, - { - "x": 460.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "F3" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#100", - "path": [ - { - "x": 625.0, - "y": 645.0 - }, - { - "x": 625.0, - "y": 540.0 - }, - { - "x": 390.0, - "y": 540.0 - }, - { - "x": 390.0, - "y": 515.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#101", - "path": [ - { - "x": 395.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#102", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#103", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#104", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "name": "unnamedWire#105", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "or4#0", - "pinName": "A1" - }, - "name": "unnamedWire#106", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "or4#0", - "pinName": "A2" - }, - "name": "unnamedWire#107", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "or4#0", - "pinName": "A3" - }, - "name": "unnamedWire#108", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "or4#0", - "pinName": "A4" - }, - "name": "unnamedWire#109", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 355.0, - "y": 405.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 360.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 365.0, - "y": 425.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 370.0, - "y": 435.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 105.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "name": "unnamedWire#115", - "path": [ - { - "x": 110.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 115.0, - "y": 515.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "name": "unnamedWire#117", - "path": [ - { - "x": 100.0, - "y": 960.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#118", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#119", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 460.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#120", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "name": "unnamedWire#121", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "name": "unnamedWire#122", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "name": "unnamedWire#123", - "path": [ - { - "x": 120.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "name": "unnamedWire#124", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#125", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#126", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#127", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#128", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "name": "unnamedWire#129", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 230.0, - "y": 715.0 - }, - { - "x": 230.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "name": "unnamedWire#130", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "name": "unnamedWire#131", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C1" - }, - "name": "unnamedWire#132", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C2" - }, - "name": "unnamedWire#133", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C3" - }, - "name": "unnamedWire#134", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "IN" - }, - "name": "unnamedWire#135", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "B1" - }, - "name": "unnamedWire#136", - "path": [ - { - "x": 105.0, - "y": 1000.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "B2" - }, - "name": "unnamedWire#137", - "path": [ - { - "x": 110.0, - "y": 1010.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "B3" - }, - "name": "unnamedWire#138", - "path": [ - { - "x": 115.0, - "y": 1020.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "B4" - }, - "name": "unnamedWire#139", - "path": [ - { - "x": 120.0, - "y": 1030.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "C" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 715.0, - "y": 750.0 - }, - { - "x": 715.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "D1" - }, - "name": "unnamedWire#140", - "path": [ - { - "x": 195.0, - "y": 730.0 - }, - { - "x": 195.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "D2" - }, - "name": "unnamedWire#141", - "path": [ - { - "x": 200.0, - "y": 740.0 - }, - { - "x": 200.0, - "y": 275.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "D3" - }, - "name": "unnamedWire#142", - "path": [ - { - "x": 205.0, - "y": 750.0 - }, - { - "x": 205.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "D4" - }, - "name": "unnamedWire#143", - "path": [ - { - "x": 210.0, - "y": 760.0 - }, - { - "x": 210.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "RAMWE" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#144", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#145" - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "WE" - }, - "name": "unnamedWire#146", - "path": [ - { - "x": 630.0, - "y": 185.0 - }, - { - "x": 630.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "QWE" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "WE" - }, - "name": "unnamedWire#147", - "path": [ - { - "x": 450.0, - "y": 215.0 - }, - { - "x": 450.0, - "y": 245.0 - }, - { - "x": 190.0, - "y": 245.0 - }, - { - "x": 190.0, - "y": 980.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "YF" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#148", - "path": [ - { - "x": 435.0, - "y": 195.0 - }, - { - "x": 435.0, - "y": 355.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O0" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "D1" - }, - "name": "unnamedWire#149", - "path": [ - { - "x": 505.0, - "y": 630.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I8" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 835.0, - "y": 760.0 - }, - { - "x": 835.0, - "y": 315.0 - }, - { - "x": 365.0, - "y": 315.0 - }, - { - "x": 365.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#151", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#152", - "path": [ - { - "x": 555.0, - "y": 375.0 - }, - { - "x": 555.0, - "y": 520.0 - }, - { - "x": 740.0, - "y": 520.0 - }, - { - "x": 740.0, - "y": 1230.0 - }, - { - "x": 745.0, - "y": 1230.0 - } - ] - }, - { - "pin1": { - "compName": "or4#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "name": "unnamedWire#153", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#154", - "path": [ - { - "x": 415.0, - "y": 445.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#155", - "path": [ - { - "x": 415.0, - "y": 455.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F\u003d0" - }, - "name": "unnamedWire#156", - "path": [ - { - "x": 445.0, - "y": 450.0 - }, - { - "x": 445.0, - "y": 490.0 - }, - { - "x": 310.0, - "y": 490.0 - }, - { - "x": 310.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "name": "unnamedWire#157", - "path": [ - { - "x": 765.0, - "y": 1220.0 - }, - { - "x": 750.0, - "y": 1220.0 - }, - { - "x": 750.0, - "y": 510.0 - }, - { - "x": 565.0, - "y": 510.0 - }, - { - "x": 565.0, - "y": 355.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "name": "unnamedWire#158", - "path": [ - { - "x": 100.0, - "y": 1115.0 - }, - { - "x": 380.0, - "y": 1115.0 - }, - { - "x": 380.0, - "y": 930.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "IN" - }, - "name": "unnamedWire#159", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "C" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 255.0, - "y": 735.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#160", - "path": [ - { - "x": 100.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "OUT" - }, - "name": "unnamedWire#161", - "path": [ - { - "x": 100.0, - "y": 885.0 - }, - { - "x": 380.0, - "y": 885.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F3" - }, - "name": "unnamedWire#162", - "path": [ - { - "x": 5.0, - "y": 545.0 - }, - { - "x": 5.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "name": "unnamedWire#163", - "path": [ - { - "x": 550.0, - "y": 385.0 - }, - { - "x": 550.0, - "y": 525.0 - }, - { - "x": 735.0, - "y": 525.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#42", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#164", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "EN" - }, - "name": "unnamedWire#165", - "path": [ - { - "x": 395.0, - "y": 890.0 - }, - { - "x": 395.0, - "y": 860.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "name": "unnamedWire#166", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#42", - "pinName": "" - }, - "name": "unnamedWire#167", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#44", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#168", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#44", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#45", - "pinName": "" - }, - "name": "unnamedWire#169", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "C" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 255.0, - "y": 900.0 - }, - { - "x": 195.0, - "y": 900.0 - }, - { - "x": 195.0, - "y": 970.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "EN" - }, - "pin2": { - "compName": "WireCrossPoint#45", - "pinName": "" - }, - "name": "unnamedWire#170", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "IN" - }, - "name": "unnamedWire#171", - "path": [ - { - "x": 395.0, - "y": 735.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "C4" - }, - "pin2": { - "compName": "WireCrossPoint#46", - "pinName": "" - }, - "name": "unnamedWire#172", - "path": [ - { - "x": 145.0, - "y": 1070.0 - }, - { - "x": 145.0, - "y": 1080.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#46", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "OUT" - }, - "name": "unnamedWire#173", - "path": [ - { - "x": 425.0, - "y": 960.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#46", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Qn+3" - }, - "name": "unnamedWire#174", - "path": [ - { - "x": 425.0, - "y": 1150.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "B0" - }, - "name": "unnamedWire#178", - "path": [ - { - "x": 635.0, - "y": 365.0 - }, - { - "x": 635.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "name": "unnamedWire#179", - "path": [] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "LSH" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 420.0, - "y": 205.0 - }, - { - "x": 420.0, - "y": 240.0 - }, - { - "x": 135.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "NSH" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 425.0, - "y": 165.0 - }, - { - "x": 425.0, - "y": 235.0 - }, - { - "x": 130.0, - "y": 235.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I4" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 800.0, - "y": 800.0 - }, - { - "x": 800.0, - "y": 610.0 - }, - { - "x": 575.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901DestDecode#0", - "pinName": "RSH" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 430.0, - "y": 175.0 - }, - { - "x": 430.0, - "y": 230.0 - }, - { - "x": 125.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "SA" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "SB" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "SC" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#44", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "SA" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 135.0, - "y": 930.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "SB" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 130.0, - "y": 940.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "SC" - }, - "pin2": { - "compName": "WireCrossPoint#42", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 125.0, - "y": 950.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "B3" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 650.0, - "y": 245.0 - }, - { - "x": 650.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "B2" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 645.0, - "y": 235.0 - }, - { - "x": 645.0, - "y": 345.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I3" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 795.0, - "y": 810.0 - }, - { - "x": 795.0, - "y": 605.0 - }, - { - "x": 565.0, - "y": 605.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "B1" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 640.0, - "y": 355.0 - }, - { - "x": 640.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 490.0, - "y": 480.0 - }, - { - "x": 600.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "D4" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O3" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 475.0, - "y": 645.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O2" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "D3" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 485.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "D2" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O1" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 495.0, - "y": 635.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QA1" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D1" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QA2" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D2" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QA3" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D3" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QA4" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D4" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QB1" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D1" - }, - "name": "unnamedWire#39", - "path": [ - { - "x": 695.0, - "y": 215.0 - }, - { - "x": 695.0, - "y": 575.0 - }, - { - "x": 250.0, - "y": 575.0 - }, - { - "x": 250.0, - "y": 695.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I2" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 790.0, - "y": 820.0 - }, - { - "x": 790.0, - "y": 600.0 - }, - { - "x": 555.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QB2" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D2" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 700.0, - "y": 225.0 - }, - { - "x": 700.0, - "y": 570.0 - }, - { - "x": 245.0, - "y": 570.0 - }, - { - "x": 245.0, - "y": 705.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QB3" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D3" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 705.0, - "y": 235.0 - }, - { - "x": 705.0, - "y": 565.0 - }, - { - "x": 240.0, - "y": 565.0 - }, - { - "x": 240.0, - "y": 715.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "QB4" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D4" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 710.0, - "y": 245.0 - }, - { - "x": 710.0, - "y": 560.0 - }, - { - "x": 235.0, - "y": 560.0 - }, - { - "x": 235.0, - "y": 725.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Cn" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Cn" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 55.0, - "y": 1050.0 - }, - { - "x": 55.0, - "y": 600.0 - }, - { - "x": 520.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "ram4#0", - "pinName": "A0" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "name": "unnamedWire#44", - "path": [ - { - "x": 650.0, - "y": 175.0 - }, - { - "x": 650.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "A1" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 645.0, - "y": 155.0 - }, - { - "x": 645.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "A2" - }, - "name": "unnamedWire#46", - "path": [ - { - "x": 640.0, - "y": 145.0 - }, - { - "x": 640.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "pin2": { - "compName": "ram4#0", - "pinName": "A3" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 635.0, - "y": 135.0 - }, - { - "x": 635.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 765.0, - "y": 175.0 - }, - { - "x": 765.0, - "y": 80.0 - }, - { - "x": 350.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 770.0, - "y": 185.0 - }, - { - "x": 770.0, - "y": 75.0 - }, - { - "x": 345.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I1" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 785.0, - "y": 830.0 - }, - { - "x": 785.0, - "y": 595.0 - }, - { - "x": 545.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [ - { - "x": 775.0, - "y": 195.0 - }, - { - "x": 775.0, - "y": 70.0 - }, - { - "x": 340.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 780.0, - "y": 205.0 - }, - { - "x": 780.0, - "y": 65.0 - }, - { - "x": 335.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "A1" - }, - "name": "unnamedWire#56", - "path": [ - { - "x": 350.0, - "y": 655.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "A2" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 345.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "A3" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 340.0, - "y": 665.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "A4" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 335.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "I0" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 780.0, - "y": 840.0 - }, - { - "x": 780.0, - "y": 590.0 - }, - { - "x": 535.0, - "y": 590.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q1" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "B1" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 300.0, - "y": 695.0 - }, - { - "x": 300.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q2" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "B2" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 305.0, - "y": 705.0 - }, - { - "x": 305.0, - "y": 685.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q3" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "B3" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 310.0, - "y": 715.0 - }, - { - "x": 310.0, - "y": 690.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q4" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "B4" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 315.0, - "y": 725.0 - }, - { - "x": 315.0, - "y": 695.0 - } - ] - }, - { - "pin1": { - "compName": "dff4#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "dff4#0", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "dff4#0", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "dff4#0", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#67", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "name": "unnamedWire#69", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#70", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Qn" - }, - "pin2": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 80.0, - "y": 200.0 - }, - { - "x": 80.0, - "y": 965.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 245.0, - "y": 1095.0 - }, - { - "x": 130.0, - "y": 1095.0 - }, - { - "x": 130.0, - "y": 1050.0 - }, - { - "x": 135.0, - "y": 1050.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 250.0, - "y": 1100.0 - }, - { - "x": 135.0, - "y": 1100.0 - }, - { - "x": 135.0, - "y": 1055.0 - }, - { - "x": 140.0, - "y": 1055.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "C1" - }, - "name": "unnamedWire#74", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "C2" - }, - "name": "unnamedWire#75", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "C3" - }, - "name": "unnamedWire#76", - "path": [ - { - "x": 255.0, - "y": 1105.0 - }, - { - "x": 140.0, - "y": 1105.0 - }, - { - "x": 140.0, - "y": 1060.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "Am2901DestDecode#0", - "pinName": "I7" - }, - "name": "unnamedWire#77", - "path": [ - { - "x": 840.0, - "y": 770.0 - }, - { - "x": 840.0, - "y": 310.0 - }, - { - "x": 370.0, - "y": 310.0 - }, - { - "x": 370.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "RAMn" - }, - "pin2": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 75.0, - "y": 100.0 - }, - { - "x": 75.0, - "y": 765.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "A2" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 240.0, - "y": 1090.0 - }, - { - "x": 125.0, - "y": 1090.0 - }, - { - "x": 125.0, - "y": 1045.0 - }, - { - "x": 130.0, - "y": 1045.0 - }, - { - "x": 130.0, - "y": 970.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 755.0, - "y": 1225.0 - }, - { - "x": 745.0, - "y": 1225.0 - }, - { - "x": 745.0, - "y": 515.0 - }, - { - "x": 560.0, - "y": 515.0 - }, - { - "x": 560.0, - "y": 365.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Q1" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 320.0, - "y": 705.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Q2" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 325.0, - "y": 940.0 - }, - { - "x": 325.0, - "y": 710.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Q3" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 330.0, - "y": 950.0 - }, - { - "x": 330.0, - "y": 715.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Q4" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 335.0, - "y": 720.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "A3" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 135.0, - "y": 980.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "A4" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 140.0, - "y": 990.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "D1" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "D2" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "D3" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "sel3_4#1", - "pinName": "Y4" - }, - "pin2": { - "compName": "dff4#0", - "pinName": "D4" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 15.0, - "y": 950.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Cn+4" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 615.0, - "y": 665.0 - }, - { - "x": 615.0, - "y": 1200.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "OVR" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "OVR" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 610.0, - "y": 675.0 - }, - { - "x": 610.0, - "y": 1125.0 - }, - { - "x": 95.0, - "y": 1125.0 - }, - { - "x": 95.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "F1" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 635.0, - "y": 625.0 - }, - { - "x": 635.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "F4" - }, - "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "name": "unnamedWire#93", - "path": [ - { - "x": 620.0, - "y": 655.0 - }, - { - "x": 620.0, - "y": 545.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#3", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#45", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#3", - "pinName": "EN" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C4" - }, - "name": "unnamedWire#96", - "path": [ - { - "x": 435.0, - "y": 795.0 - }, - { - "x": 195.0, - "y": 795.0 - }, - { - "x": 195.0, - "y": 880.0 - }, - { - "x": 140.0, - "y": 880.0 - }, - { - "x": 140.0, - "y": 870.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RAMn+3" - }, - "name": "unnamedWire#97", - "path": [ - { - "x": 455.0, - "y": 735.0 - }, - { - "x": 455.0, - "y": 1100.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#98", - "path": [ - { - "x": 380.0, - "y": 505.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", - "pinName": "F2" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#99", - "path": [ - { - "x": 630.0, - "y": 635.0 - }, - { - "x": 630.0, - "y": 535.0 - }, - { - "x": 385.0, - "y": 535.0 - }, - { - "x": 385.0, - "y": 510.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "qreg": { - "id": "delegating", - "params": { - "delegateTarget": "dff4#0" - } - }, - "regs": { - "id": "delegating", - "params": { - "delegateTarget": "ram4#0" - } - } - }, - "atomicHighLevelStates": {} - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json deleted file mode 100644 index 90f0ad95..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json +++ /dev/null @@ -1,725 +0,0 @@ -{ - "width": 35.0, - "height": 60.0, - "interfacePins": [ - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "CinE", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "FN", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I5", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "L", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "RN", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "SBE", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "SN", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 15.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 15.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 55.0, - "y": 45.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 55.0, - "y": 70.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 100.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 4.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 39.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 4.0, - "y": 44.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 9.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 9.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 9.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 9.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 49.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 49.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 39.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 100.0, - "y": 135.0 - } - }, - { - "id": "nand3", - "name": "nand3#0", - "pos": { - "x": 55.0, - "y": 10.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I5" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SN" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 10.0, - "y": 105.0 - }, - { - "x": 135.0, - "y": 105.0 - }, - { - "x": 135.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I3" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 50.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RN" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 50.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 50.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "CinE" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 40.0, - "y": 5.0 - }, - { - "x": 115.0, - "y": 5.0 - }, - { - "x": 115.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "C" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 40.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "nand3#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#27" - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#28" - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#29" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "L" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SBE" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 45.0, - "y": 45.0 - }, - { - "x": 45.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "FN" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 5.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "A" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 40.0 - }, - { - "x": 45.0, - "y": 40.0 - }, - { - "x": 45.0, - "y": 15.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901ALUFuncDecode", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json deleted file mode 100644 index 9652a6d6..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json +++ /dev/null @@ -1,1541 +0,0 @@ -{ - "width": 35.0, - "height": 120.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "Cn", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "Cn+4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "F1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "F2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "F3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "F4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I5", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "OVR", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "R1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "R2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "R3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "R4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "S1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "S2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 105.0 - }, - "name": "S3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 115.0 - }, - "name": "S4", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "Am2901ALUFuncDecode", - "name": "Am2901ALUFuncDecode#0", - "pos": { - "x": 20.0, - "y": 2.5 - } - }, - { - "id": "Am2901ALUOneBit", - "name": "Am2901ALUOneBit#0", - "pos": { - "x": 45.0, - "y": 80.0 - } - }, - { - "id": "Am2901ALUOneBit", - "name": "Am2901ALUOneBit#1", - "pos": { - "x": 45.0, - "y": 180.0 - } - }, - { - "id": "Am2901ALUOneBit", - "name": "Am2901ALUOneBit#2", - "pos": { - "x": 45.0, - "y": 280.0 - } - }, - { - "id": "Am2901ALUOneBit", - "name": "Am2901ALUOneBit#3", - "pos": { - "x": 45.0, - "y": 380.0 - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 94.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 194.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 31.5, - "y": 244.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 31.5, - "y": 344.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 34.0, - "y": 154.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 34.0, - "y": 254.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 34.0, - "y": 354.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 36.5, - "y": 164.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 36.5, - "y": 264.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 36.5, - "y": 364.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 84.0, - "y": 374.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 84.0, - "y": 384.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 24.0, - "y": 294.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 26.5, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 26.5, - "y": 204.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 26.5, - "y": 304.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 29.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 29.0, - "y": 224.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 29.0, - "y": 324.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 31.5, - "y": 144.0 - }, - "params": 1 - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 95.0, - "y": 400.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I5" - }, - "pin2": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "I5" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 5.0, - "y": 20.0 - }, - { - "x": 5.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I4" - }, - "pin2": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "I4" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 60.0 - }, - { - "x": 10.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "CinE" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 70.0, - "y": 7.5 - }, - { - "x": 70.0, - "y": 77.5 - }, - { - "x": 27.5, - "y": 77.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "CinE" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "CinE" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "CinE" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "CinE" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 27.5, - "y": 405.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "RN" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 57.5, - "y": 57.5 - }, - { - "x": 57.5, - "y": 65.0 - }, - { - "x": 30.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I3" - }, - "pin2": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "I3" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 15.0, - "y": 100.0 - }, - { - "x": 15.0, - "y": 27.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "RN" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "RN" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "RN" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "RN" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 30.0, - "y": 425.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "SN" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 65.0, - "y": 27.5 - }, - { - "x": 65.0, - "y": 72.5 - }, - { - "x": 32.5, - "y": 72.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "SN" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "SN" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "SN" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "SBE" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 62.5, - "y": 37.5 - }, - { - "x": 62.5, - "y": 70.0 - }, - { - "x": 25.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "SN" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 32.5, - "y": 445.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "FN" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 60.0, - "y": 47.5 - }, - { - "x": 60.0, - "y": 67.5 - }, - { - "x": 35.0, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "FN" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "FN" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "FN" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "FN" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 35.0, - "y": 455.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "L" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 67.5, - "y": 17.5 - }, - { - "x": 67.5, - "y": 75.0 - }, - { - "x": 37.5, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "L" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "L" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "L" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "L" - }, - "name": "unnamedWire#44", - "path": [ - { - "x": 37.5, - "y": 465.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "R1" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "R" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 10.0, - "y": 180.0 - }, - { - "x": 10.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "R2" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "R" - }, - "name": "unnamedWire#46", - "path": [ - { - "x": 10.0, - "y": 220.0 - }, - { - "x": 10.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "R3" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "R" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 10.0, - "y": 260.0 - }, - { - "x": 10.0, - "y": 315.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "R4" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "R" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 20.0, - "y": 300.0 - }, - { - "x": 20.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S1" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "S" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 15.0, - "y": 340.0 - }, - { - "x": 15.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S2" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "S" - }, - "name": "unnamedWire#50", - "path": [ - { - "x": 5.0, - "y": 380.0 - }, - { - "x": 5.0, - "y": 235.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S3" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "S" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 10.0, - "y": 420.0 - }, - { - "x": 10.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S4" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "S" - }, - "name": "unnamedWire#52", - "path": [ - { - "x": 10.0, - "y": 460.0 - }, - { - "x": 10.0, - "y": 435.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Cn" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "Cin" - }, - "name": "unnamedWire#53", - "path": [ - { - "x": 5.0, - "y": 140.0 - }, - { - "x": 5.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#0", - "pinName": "Cout" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "Cin" - }, - "name": "unnamedWire#54", - "path": [ - { - "x": 85.0, - "y": 85.0 - }, - { - "x": 85.0, - "y": 175.0 - }, - { - "x": 40.0, - "y": 175.0 - }, - { - "x": 40.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#1", - "pinName": "Cout" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "Cin" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 85.0, - "y": 185.0 - }, - { - "x": 85.0, - "y": 275.0 - }, - { - "x": 40.0, - "y": 275.0 - }, - { - "x": 40.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#2", - "pinName": "Cout" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [ - { - "x": 85.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "Cin" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 40.0, - "y": 375.0 - }, - { - "x": 40.0, - "y": 385.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#3", - "pinName": "Cout" - }, - "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#0", - "pinName": "F" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F1" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 90.0, - "y": 95.0 - }, - { - "x": 90.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#0", - "pinName": "CoutE" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#1", - "pinName": "F" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F2" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 95.0, - "y": 195.0 - }, - { - "x": 95.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#2", - "pinName": "F" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F3" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 100.0, - "y": 295.0 - }, - { - "x": 100.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUOneBit#3", - "pinName": "F" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F4" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 105.0, - "y": 395.0 - }, - { - "x": 105.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "xor#0", - "pinName": "A" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 90.0, - "y": 375.0 - }, - { - "x": 90.0, - "y": 405.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 85.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Cn+4" - }, - "name": "unnamedWire#65", - "path": [ - { - "x": 130.0, - "y": 385.0 - }, - { - "x": 130.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "OVR" - }, - "name": "unnamedWire#66" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#1", - "pinName": "CoutE" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#2", - "pinName": "CoutE" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "Am2901ALUOneBit#3", - "pinName": "CoutE" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 25.0, - "y": 395.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901ALUInclDecode", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json deleted file mode 100644 index 38b9bd59..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json +++ /dev/null @@ -1,1346 +0,0 @@ -{ - "width": 95.0, - "height": 110.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 40.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 60.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 70.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 0.0 - }, - "name": "Cn", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 95.0, - "y": 45.0 - }, - "name": "Cn+4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 95.0, - "y": 5.0 - }, - "name": "F1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 95.0, - "y": 15.0 - }, - "name": "F2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 95.0, - "y": 25.0 - }, - "name": "F3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 95.0, - "y": 35.0 - }, - "name": "F4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 25.0, - "y": 0.0 - }, - "name": "I0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 0.0 - }, - "name": "I1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 45.0, - "y": 0.0 - }, - "name": "I2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 55.0, - "y": 0.0 - }, - "name": "I3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 65.0, - "y": 0.0 - }, - "name": "I4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 75.0, - "y": 0.0 - }, - "name": "I5", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 95.0, - "y": 55.0 - }, - "name": "OVR", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "Q1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 90.0 - }, - "name": "Q2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "Q3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 100.0 - }, - "name": "Q4", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "Am2901ALUInclDecode", - "name": "Am2901ALUInclDecode#0", - "pos": { - "x": 315.0, - "y": 15.0 - } - }, - { - "id": "Am2901SourceDecode", - "name": "Am2901SourceDecode#0", - "pos": { - "x": 155.0, - "y": 160.0 - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 209.0, - "y": 224.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 214.0, - "y": 234.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 219.0, - "y": 244.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 224.0, - "y": 254.0 - }, - "params": 1 - }, - { - "id": "sel2_4", - "name": "sel2_4#0", - "pos": { - "x": 235.0, - "y": 85.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#0", - "pos": { - "x": 235.0, - "y": 190.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I5" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I5" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 300.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Cn" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "Cn" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 40.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 10.0, - "y": 100.0 - }, - { - "x": 10.0, - "y": 85.0 - }, - { - "x": 170.0, - "y": 85.0 - }, - { - "x": 170.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 55.0, - "y": 140.0 - }, - { - "x": 55.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 50.0, - "y": 160.0 - }, - { - "x": 50.0, - "y": 235.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 45.0, - "y": 180.0 - }, - { - "x": 45.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 40.0, - "y": 200.0 - }, - { - "x": 40.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 210.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 215.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 220.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 225.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "I3" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 220.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 25.0, - "y": 240.0 - }, - { - "x": 25.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 20.0, - "y": 260.0 - }, - { - "x": 20.0, - "y": 275.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 20.0, - "y": 280.0 - }, - { - "x": 20.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 20.0, - "y": 300.0 - }, - { - "x": 20.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q1" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C1" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 20.0, - "y": 340.0 - }, - { - "x": 20.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q2" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C2" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 25.0, - "y": 360.0 - }, - { - "x": 25.0, - "y": 315.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q3" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C3" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 30.0, - "y": 380.0 - }, - { - "x": 30.0, - "y": 325.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I2" - }, - "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "I2" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 180.0, - "y": 5.0 - }, - { - "x": 150.0, - "y": 5.0 - }, - { - "x": 150.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q4" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "C4" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 35.0, - "y": 400.0 - }, - { - "x": 35.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "SC" - }, - "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "SQ" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 200.0, - "y": 215.0 - }, - { - "x": 200.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "RD" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "SA" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 195.0, - "y": 205.0 - }, - { - "x": 195.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "SB" - }, - "pin2": { - "compName": "sel3_4#0", - "pinName": "SB" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 205.0, - "y": 185.0 - }, - { - "x": 205.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "SA" - }, - "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "SA" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "R1" - }, - "name": "unnamedWire#36", - "path": [ - { - "x": 275.0, - "y": 90.0 - }, - { - "x": 275.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "R2" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 280.0, - "y": 100.0 - }, - { - "x": 280.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "R3" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 285.0, - "y": 110.0 - }, - { - "x": 285.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "R4" - }, - "name": "unnamedWire#39", - "path": [ - { - "x": 290.0, - "y": 120.0 - }, - { - "x": 290.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "I1" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 140.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "S1" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 295.0, - "y": 195.0 - }, - { - "x": 295.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "S2" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 300.0, - "y": 205.0 - }, - { - "x": 300.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "S3" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 305.0, - "y": 215.0 - }, - { - "x": 305.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "sel3_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "S4" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 310.0, - "y": 225.0 - }, - { - "x": 310.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "F1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F1" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "F2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F2" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 375.0, - "y": 30.0 - }, - { - "x": 375.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "F3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F3" - }, - "name": "unnamedWire#46", - "path": [ - { - "x": 370.0, - "y": 40.0 - }, - { - "x": 370.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "F4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F4" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 365.0, - "y": 50.0 - }, - { - "x": 365.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "Cn+4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Cn+4" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 360.0, - "y": 60.0 - }, - { - "x": 360.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "OVR" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "OVR" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 355.0, - "y": 70.0 - }, - { - "x": 355.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "Am2901SourceDecode#0", - "pinName": "I0" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 100.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I4" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I4" - }, - "name": "unnamedWire#50", - "path": [ - { - "x": 260.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "RA" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "SB" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 205.0, - "y": 175.0 - }, - { - "x": 205.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 10.0, - "y": 40.0 - }, - { - "x": 10.0, - "y": 55.0 - }, - { - "x": 185.0, - "y": 55.0 - }, - { - "x": 185.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 10.0, - "y": 60.0 - }, - { - "x": 10.0, - "y": 65.0 - }, - { - "x": 180.0, - "y": 65.0 - }, - { - "x": 180.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 80.0 - }, - { - "x": 10.0, - "y": 75.0 - }, - { - "x": 175.0, - "y": 75.0 - }, - { - "x": 175.0, - "y": 130.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901ALUInclSourceDecodeInclFunctionDecode", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json deleted file mode 100644 index 31cf8af2..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json +++ /dev/null @@ -1,557 +0,0 @@ -{ - "width": 35.0, - "height": 90.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "Cin", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "CinE", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Cout", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "CoutE", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "F", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "FN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "L", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "R", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "RN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "S", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "SN", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 60.0, - "y": 55.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 49.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 54.0, - "y": 69.0 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 10.0, - "y": 20.0 - } - }, - { - "id": "and", - "name": "and#1", - "pos": { - "x": 135.0, - "y": 20.0 - } - }, - { - "id": "fulladder", - "name": "fulladder#0", - "pos": { - "x": 60.0, - "y": 20.0 - } - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 90.0, - "y": 70.0 - } - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 10.0, - "y": 190.0 - } - }, - { - "id": "xor", - "name": "xor#1", - "pos": { - "x": 10.0, - "y": 290.0 - } - }, - { - "id": "xor", - "name": "xor#2", - "pos": { - "x": 135.0, - "y": 70.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Cin" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "CoutE" - }, - "pin2": { - "compName": "and#1", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 75.0 - }, - { - "x": 5.0, - "y": 10.0 - }, - { - "x": 130.0, - "y": 10.0 - }, - { - "x": 130.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 50.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "fulladder#0", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 50.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "xor#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 55.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "fulladder#0", - "pinName": "C" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 55.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "fulladder#0", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 100.0, - "y": 25.0 - }, - { - "x": 100.0, - "y": 65.0 - }, - { - "x": 85.0, - "y": 65.0 - }, - { - "x": 85.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "fulladder#0", - "pinName": "Z" - }, - "pin2": { - "compName": "and#1", - "pinName": "B" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 82.5, - "y": 65.0 - }, - { - "x": 82.5, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "xor#2", - "pinName": "A" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "CinE" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 7.5, - "y": 125.0 - }, - { - "x": 7.5, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "and#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Cout" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "xor#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "F" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "R" - }, - "pin2": { - "compName": "xor#0", - "pinName": "A" - }, - "name": "unnamedWire#3" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "RN" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#4" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S" - }, - "pin2": { - "compName": "xor#1", - "pinName": "A" - }, - "name": "unnamedWire#5" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SN" - }, - "pin2": { - "compName": "xor#1", - "pinName": "B" - }, - "name": "unnamedWire#6" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "FN" - }, - "pin2": { - "compName": "xor#2", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 130.0, - "y": 375.0 - }, - { - "x": 130.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "L" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "S0" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 87.5, - "y": 425.0 - }, - { - "x": 87.5, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "fulladder#0", - "pinName": "A" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901ALUOneBit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json deleted file mode 100644 index 27cd4f01..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json +++ /dev/null @@ -1,1095 +0,0 @@ -{ - "width": 35.0, - "height": 60.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I6", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I7", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I8", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "LSH", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "NSH", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "QWE", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "RAMWE", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "RSH", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "YF", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 15.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 15.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 80.0, - "y": 145.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 110.0, - "y": 105.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#12", - "pos": { - "x": 115.0, - "y": 210.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 15.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 15.0, - "y": 150.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 50.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 50.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 50.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 50.0, - "y": 130.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 80.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 80.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 4.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 39.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 74.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 74.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 74.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 74.0, - "y": 159.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 109.0, - "y": 214.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 4.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 9.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 9.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 9.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 4.0, - "y": 154.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 39.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 44.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 44.0, - "y": 54.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I8" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 5.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I6" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 5.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 5.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 5.0, - "y": 5.0 - }, - { - "x": 40.0, - "y": 5.0 - }, - { - "x": 40.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 40.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 40.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "NSH" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 45.0, - "y": 5.0 - }, - { - "x": 135.0, - "y": 5.0 - }, - { - "x": 135.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 45.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 10.0, - "y": 115.0 - }, - { - "x": 45.0, - "y": 115.0 - }, - { - "x": 45.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 40.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 40.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 75.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "B" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 75.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RAMWE" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 125.0, - "y": 60.0 - }, - { - "x": 125.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "A" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 75.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "LSH" - }, - "name": "unnamedWire#36", - "path": [ - { - "x": 125.0, - "y": 140.0 - }, - { - "x": 125.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 75.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "B" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RSH" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 130.0, - "y": 20.0 - }, - { - "x": 130.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#41" - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "B" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 75.0, - "y": 170.0 - }, - { - "x": 105.0, - "y": 170.0 - }, - { - "x": 105.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 110.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#12", - "pinName": "A" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#12", - "pinName": "B" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 110.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "YF" - }, - "name": "unnamedWire#46" - }, - { - "pin1": { - "compName": "NandGate#12", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QWE" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I7" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 10.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901DestDecode", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json deleted file mode 100644 index 25a64839..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json +++ /dev/null @@ -1,1138 +0,0 @@ -{ - "width": 35.0, - "height": 50.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "RA", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "RD", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "SA", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "SB", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "SQ", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 10.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 70.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 70.0, - "y": 130.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#12", - "pos": { - "x": 70.0, - "y": 170.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#13", - "pos": { - "x": 100.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#14", - "pos": { - "x": 100.0, - "y": 170.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 10.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 40.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 40.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 40.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 40.0, - "y": 130.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 40.0, - "y": 170.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 70.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 70.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 6.5, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 36.5, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 64.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 64.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 64.0, - "y": 139.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 94.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 94.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 4.0, - "y": 144.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 6.5, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 6.5, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 6.5, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 31.5, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 34.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 34.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 34.0, - "y": 134.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I2" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 5.0 - }, - { - "x": 35.0, - "y": 5.0 - }, - { - "x": 35.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 7.5, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 7.5, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 7.5, - "y": 112.5 - }, - { - "x": 32.5, - "y": 112.5 - }, - { - "x": 32.5, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 32.5, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 32.5, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 35.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 35.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "B" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 37.5, - "y": 35.0 - }, - { - "x": 65.0, - "y": 35.0 - }, - { - "x": 65.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 37.5, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#29" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 7.5, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "A" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 65.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 65.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 65.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "B" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 65.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 65.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "B" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 65.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#12", - "pinName": "A" - }, - "name": "unnamedWire#39" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 7.5, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#13", - "pinName": "A" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 95.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#13", - "pinName": "B" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 95.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RA" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SB" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SA" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#12", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#14", - "pinName": "A" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 95.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#14", - "pinName": "B" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 95.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#13", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SQ" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#14", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "RD" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#12", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 5.0, - "y": 195.0 - }, - { - "x": 65.0, - "y": 195.0 - }, - { - "x": 65.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 7.5, - "y": 55.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2901SourceDecode", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json deleted file mode 100644 index 424c5471..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ /dev/null @@ -1,5222 +0,0 @@ -{ - "width": 120.0, - "height": 155.0, - "interfacePins": [ - { - "location": { - "x": 55.0, - "y": 0.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 120.0, - "y": 85.0 - }, - "name": "C0", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 120.0, - "y": 55.0 - }, - "name": "CT", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "Cx", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "I", - "logicWidth": 13, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "IC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "IN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "IOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "IZ", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 120.0, - "y": 125.0 - }, - "name": "QIO0", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 125.0 - }, - "name": "QIOn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 120.0, - "y": 120.0 - }, - "name": "SIO0", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 120.0 - }, - "name": "SIOn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 120.0, - "y": 10.0 - }, - "name": "YC", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 120.0, - "y": 15.0 - }, - "name": "YN", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 120.0, - "y": 20.0 - }, - "name": "YOVR", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 120.0, - "y": 5.0 - }, - "name": "YZ", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 5.0, - "y": 0.0 - }, - "name": "_CEM", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 45.0, - "y": 0.0 - }, - "name": "_CEmu", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 15.0, - "y": 0.0 - }, - "name": "_EC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 20.0, - "y": 0.0 - }, - "name": "_EN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 25.0, - "y": 0.0 - }, - "name": "_EOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 0.0 - }, - "name": "_EZ", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 110.0, - "y": 0.0 - }, - "name": "_OECT", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 90.0, - "y": 0.0 - }, - "name": "_OEY", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 110.0 - }, - "name": "_SE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Am2904MSR", - "name": "Am2904MSR#0", - "pos": { - "x": 205.0, - "y": 90.0 - } - }, - { - "id": "Am2904RegCTInstrDecode", - "name": "Am2904RegCTInstrDecode#0", - "pos": { - "x": 180.0, - "y": 190.0 - } - }, - { - "id": "Am2904ShiftInstrDecode", - "name": "Am2904ShiftInstrDecode#0", - "pos": { - "x": 100.0, - "y": 495.0 - } - }, - { - "id": "Am2904TestLogic", - "name": "Am2904TestLogic#0", - "pos": { - "x": 260.0, - "y": 330.0 - } - }, - { - "id": "Am2904muSR", - "name": "Am2904muSR#0", - "pos": { - "x": 350.0, - "y": 95.0 - } - }, - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 230.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 140.0, - "y": 5.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 455.0, - "y": 55.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 555.0, - "y": 235.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 325.0, - "y": 55.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 325.0, - "y": 75.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 325.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 325.0, - "y": 35.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 185.0, - "y": 70.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 185.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 185.0, - "y": 30.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 185.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 165.0 - }, - "params": { - "logicWidth": 13, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 575.0, - "y": 40.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#10", - "pos": { - "x": 445.0, - "y": 300.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#11", - "pos": { - "x": 455.0, - "y": 635.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#12", - "pos": { - "x": 455.0, - "y": 710.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#13", - "pos": { - "x": 135.0, - "y": 645.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#14", - "pos": { - "x": 310.0, - "y": 645.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#15", - "pos": { - "x": 430.0, - "y": 535.0 - }, - "params": { - "logicWidth": 2, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#16", - "pos": { - "x": 20.0, - "y": 235.0 - }, - "params": { - "logicWidth": 6, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#17", - "pos": { - "x": 20.0, - "y": 185.0 - }, - "params": { - "logicWidth": 5, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#18", - "pos": { - "x": 15.0, - "y": 65.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#19", - "pos": { - "x": 520.0, - "y": 90.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 440.0, - "y": 90.0 - }, - "params": { - "logicWidth": 2, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#20", - "pos": { - "x": 20.0, - "y": 165.0 - }, - "params": { - "logicWidth": 2, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 465.0, - "y": 100.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 425.0, - "y": 150.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", - "pos": { - "x": 425.0, - "y": 190.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#6", - "pos": { - "x": 320.0, - "y": 310.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#7", - "pos": { - "x": 445.0, - "y": 340.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#8", - "pos": { - "x": 445.0, - "y": 380.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#9", - "pos": { - "x": 255.0, - "y": 430.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 540.0, - "y": 70.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#1", - "pos": { - "x": 400.0, - "y": 635.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#2", - "pos": { - "x": 240.0, - "y": 635.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#3", - "pos": { - "x": 550.0, - "y": 625.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#4", - "pos": { - "x": 550.0, - "y": 650.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#5", - "pos": { - "x": 575.0, - "y": 265.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 274.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 189.0, - "y": 139.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 179.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 179.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 179.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 449.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 534.0, - "y": 104.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 334.0, - "y": 174.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 384.0, - "y": 164.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 349.0, - "y": 439.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 434.0, - "y": 674.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 264.0, - "y": 619.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 329.0, - "y": 124.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 289.0, - "y": 609.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 294.0, - "y": 614.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 359.0, - "y": 514.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 359.0, - "y": 594.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 149.0, - "y": 664.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 149.0, - "y": 674.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 299.0, - "y": 584.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 464.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 459.0, - "y": 349.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#29", - "pos": { - "x": 559.0, - "y": 619.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 404.0, - "y": 114.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#30", - "pos": { - "x": 249.0, - "y": 629.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#31", - "pos": { - "x": 549.0, - "y": 239.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#32", - "pos": { - "x": 404.0, - "y": 169.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#33", - "pos": { - "x": 389.0, - "y": 204.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#34", - "pos": { - "x": 439.0, - "y": 684.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#35", - "pos": { - "x": 429.0, - "y": 664.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#36", - "pos": { - "x": 429.0, - "y": 619.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#37", - "pos": { - "x": 434.0, - "y": 644.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#38", - "pos": { - "x": 579.0, - "y": 609.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#39", - "pos": { - "x": 429.0, - "y": 609.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 224.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#40", - "pos": { - "x": 584.0, - "y": 624.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#41", - "pos": { - "x": 434.0, - "y": 614.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 569.0, - "y": 54.0 - }, - "params": 4 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 134.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 319.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 319.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 319.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 495.0, - "y": 60.0 - } - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 495.0, - "y": 280.0 - } - }, - { - "id": "mux1", - "name": "mux1#1", - "pos": { - "x": 275.0, - "y": 475.0 - } - }, - { - "id": "mux1", - "name": "mux1#2", - "pos": { - "x": 355.0, - "y": 445.0 - } - }, - { - "id": "mux1", - "name": "mux1#3", - "pos": { - "x": 395.0, - "y": 425.0 - } - }, - { - "id": "mux1", - "name": "mux1#4", - "pos": { - "x": 490.0, - "y": 530.0 - } - }, - { - "id": "mux1", - "name": "mux1#5", - "pos": { - "x": 445.0, - "y": 540.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 480.0, - "y": 85.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#1", - "pos": { - "x": 440.0, - "y": 135.0 - } - }, - { - "id": "mux2", - "name": "mux2#0", - "pos": { - "x": 470.0, - "y": 625.0 - } - }, - { - "id": "mux2", - "name": "mux2#1", - "pos": { - "x": 470.0, - "y": 700.0 - } - }, - { - "id": "mux2", - "name": "mux2#2", - "pos": { - "x": 325.0, - "y": 635.0 - } - }, - { - "id": "mux3", - "name": "mux3#0", - "pos": { - "x": 335.0, - "y": 300.0 - } - }, - { - "id": "mux3", - "name": "mux3#1", - "pos": { - "x": 155.0, - "y": 635.0 - } - }, - { - "id": "not4", - "name": "not4#0", - "pos": { - "x": 130.0, - "y": 40.0 - } - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 535.0, - "y": 270.0 - } - }, - { - "id": "xor", - "name": "xor#1", - "pos": { - "x": 475.0, - "y": 320.0 - } - }, - { - "id": "xor", - "name": "xor#2", - "pos": { - "x": 315.0, - "y": 465.0 - } - }, - { - "id": "xor", - "name": "xor#3", - "pos": { - "x": 115.0, - "y": 740.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_MUX" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "MUX" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 325.0, - "y": 200.0 - }, - { - "x": 325.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O0" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#101", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_1" - }, - "name": "unnamedWire#102", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_2" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "name": "unnamedWire#103", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_3" - }, - "name": "unnamedWire#104", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_4" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "name": "unnamedWire#105", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 330.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_4" - }, - "name": "unnamedWire#107", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_3" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O1" - }, - "name": "unnamedWire#108", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_2" - }, - "name": "unnamedWire#109", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_1" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O3" - }, - "name": "unnamedWire#110", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 435.0, - "y": 355.0 - }, - { - "x": 435.0, - "y": 245.0 - }, - { - "x": 390.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 535.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "Am2904TestLogic#0", - "pinName": "I" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 535.0, - "y": 260.0 - }, - { - "x": 385.0, - "y": 260.0 - }, - { - "x": 385.0, - "y": 290.0 - }, - { - "x": 255.0, - "y": 290.0 - }, - { - "x": 255.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904TestLogic#0", - "pinName": "Y111" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "I111" - }, - "name": "unnamedWire#114", - "path": [] - }, - { - "pin1": { - "compName": "mux3#0", - "pinName": "I110" - }, - "pin2": { - "compName": "Am2904TestLogic#0", - "pinName": "Y110" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "Am2904TestLogic#0", - "pinName": "Y101" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "I101" - }, - "name": "unnamedWire#116", - "path": [] - }, - { - "pin1": { - "compName": "mux3#0", - "pinName": "I100" - }, - "pin2": { - "compName": "Am2904TestLogic#0", - "pinName": "Y100" - }, - "name": "unnamedWire#117", - "path": [] - }, - { - "pin1": { - "compName": "Am2904TestLogic#0", - "pinName": "Y011" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "I011" - }, - "name": "unnamedWire#118", - "path": [] - }, - { - "pin1": { - "compName": "Am2904TestLogic#0", - "pinName": "Y010" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "I010" - }, - "name": "unnamedWire#119", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O2" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "mux3#0", - "pinName": "I001" - }, - "pin2": { - "compName": "Am2904TestLogic#0", - "pinName": "Y001" - }, - "name": "unnamedWire#120", - "path": [] - }, - { - "pin1": { - "compName": "Am2904TestLogic#0", - "pinName": "Y000" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "I000" - }, - "name": "unnamedWire#121", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "EN" - }, - "name": "unnamedWire#122", - "path": [ - { - "x": 585.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#123", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "CT_MUX" - }, - "name": "unnamedWire#124", - "path": [ - { - "x": 210.0, - "y": 320.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O0" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "S0" - }, - "name": "unnamedWire#125", - "path": [] - }, - { - "pin1": { - "compName": "mux3#0", - "pinName": "S1" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O1" - }, - "name": "unnamedWire#126", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O2" - }, - "pin2": { - "compName": "mux3#0", - "pinName": "S2" - }, - "name": "unnamedWire#127", - "path": [] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "CT_EXP" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "S0" - }, - "name": "unnamedWire#128", - "path": [ - { - "x": 230.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "mux3#0", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#129", - "path": [ - { - "x": 420.0, - "y": 310.0 - }, - { - "x": 420.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "A" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "CT_INV" - }, - "name": "unnamedWire#130", - "path": [ - { - "x": 415.0, - "y": 275.0 - }, - { - "x": 415.0, - "y": 280.0 - }, - { - "x": 220.0, - "y": 280.0 - } - ] - }, - { - "pin1": { - "compName": "xor#1", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#131", - "path": [ - { - "x": 515.0, - "y": 325.0 - }, - { - "x": 515.0, - "y": 315.0 - }, - { - "x": 490.0, - "y": 315.0 - }, - { - "x": 490.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "I" - }, - "name": "unnamedWire#132", - "path": [ - { - "x": 335.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#133", - "path": [ - { - "x": 390.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O2" - }, - "pin2": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "name": "unnamedWire#134", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#135", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "name": "unnamedWire#136", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "I" - }, - "name": "unnamedWire#137", - "path": [ - { - "x": 385.0, - "y": 250.0 - }, - { - "x": 430.0, - "y": 250.0 - }, - { - "x": 430.0, - "y": 395.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "OEN" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#138", - "path": [ - { - "x": 240.0, - "y": 185.0 - }, - { - "x": 410.0, - "y": 185.0 - }, - { - "x": 410.0, - "y": 80.0 - }, - { - "x": 485.0, - "y": 80.0 - }, - { - "x": 485.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O0" - }, - "name": "unnamedWire#139", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O4" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "name": "unnamedWire#140", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "I12-11" - }, - "name": "unnamedWire#141", - "path": [ - { - "x": 105.0, - "y": 170.0 - }, - { - "x": 105.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "C0_MUX" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "I" - }, - "name": "unnamedWire#142", - "path": [ - { - "x": 250.0, - "y": 445.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#1", - "pinName": "I1" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#143", - "path": [ - { - "x": 270.0, - "y": 500.0 - }, - { - "x": 270.0, - "y": 515.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "mu" - }, - "name": "unnamedWire#144", - "path": [ - { - "x": 185.0, - "y": 170.0 - }, - { - "x": 185.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#1", - "pinName": "I0" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O2" - }, - "name": "unnamedWire#145", - "path": [ - { - "x": 265.0, - "y": 490.0 - }, - { - "x": 265.0, - "y": 510.0 - }, - { - "x": 480.0, - "y": 510.0 - }, - { - "x": 480.0, - "y": 350.0 - }, - { - "x": 470.0, - "y": 350.0 - }, - { - "x": 470.0, - "y": 310.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1#1", - "pinName": "S0" - }, - "name": "unnamedWire#146", - "path": [ - { - "x": 270.0, - "y": 450.0 - }, - { - "x": 270.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#1", - "pinName": "Y" - }, - "pin2": { - "compName": "xor#2", - "pinName": "B" - }, - "name": "unnamedWire#147", - "path": [] - }, - { - "pin1": { - "compName": "xor#2", - "pinName": "A" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O0" - }, - "name": "unnamedWire#148", - "path": [ - { - "x": 290.0, - "y": 470.0 - }, - { - "x": 290.0, - "y": 460.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O2" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#149", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "I5-0" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 105.0, - "y": 260.0 - }, - { - "x": 105.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "mux1#2", - "pinName": "S0" - }, - "name": "unnamedWire#150", - "path": [ - { - "x": 350.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "xor#2", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#2", - "pinName": "I1" - }, - "name": "unnamedWire#151", - "path": [] - }, - { - "pin1": { - "compName": "mux1#2", - "pinName": "I0" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Cx" - }, - "name": "unnamedWire#152", - "path": [ - { - "x": 300.0, - "y": 460.0 - }, - { - "x": 300.0, - "y": 465.0 - }, - { - "x": 240.0, - "y": 465.0 - }, - { - "x": 240.0, - "y": 425.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#2", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#3", - "pinName": "I1" - }, - "name": "unnamedWire#153", - "path": [] - }, - { - "pin1": { - "compName": "mux1#3", - "pinName": "I0" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#154", - "path": [] - }, - { - "pin1": { - "compName": "mux1#3", - "pinName": "S0" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O3" - }, - "name": "unnamedWire#155", - "path": [] - }, - { - "pin1": { - "compName": "mux1#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "C0" - }, - "name": "unnamedWire#156", - "path": [ - { - "x": 560.0, - "y": 430.0 - }, - { - "x": 560.0, - "y": 425.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#4", - "pinName": "I1" - }, - "pin2": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "name": "unnamedWire#157", - "path": [ - { - "x": 485.0, - "y": 555.0 - }, - { - "x": 485.0, - "y": 620.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SIOn" - }, - "name": "unnamedWire#158", - "path": [ - { - "x": 55.0, - "y": 620.0 - }, - { - "x": 55.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "SIO0" - }, - "name": "unnamedWire#159", - "path": [ - { - "x": 580.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "I" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 75.0, - "y": 520.0 - }, - { - "x": 75.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#5", - "pinName": "I1" - }, - "pin2": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "name": "unnamedWire#160", - "path": [ - { - "x": 435.0, - "y": 565.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QIOn" - }, - "name": "unnamedWire#161", - "path": [ - { - "x": 435.0, - "y": 625.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#3", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "name": "unnamedWire#162", - "path": [ - { - "x": 580.0, - "y": 635.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#38", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "name": "unnamedWire#163", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#164", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#3", - "pinName": "IN" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "Y" - }, - "name": "unnamedWire#165", - "path": [] - }, - { - "pin1": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "SIO0_MUX" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "I" - }, - "name": "unnamedWire#166", - "path": [ - { - "x": 165.0, - "y": 500.0 - }, - { - "x": 165.0, - "y": 575.0 - }, - { - "x": 450.0, - "y": 575.0 - }, - { - "x": 450.0, - "y": 645.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O0" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I00" - }, - "name": "unnamedWire#167", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O2" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "S1" - }, - "name": "unnamedWire#168", - "path": [] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "S0" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O1" - }, - "name": "unnamedWire#169", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "IOVR" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O0" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 10.0, - "y": 125.0 - }, - { - "x": 10.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "name": "unnamedWire#170", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I10" - }, - "name": "unnamedWire#171", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O2" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#172", - "path": [ - { - "x": 485.0, - "y": 390.0 - }, - { - "x": 485.0, - "y": 515.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#173", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O1" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "S0" - }, - "name": "unnamedWire#174", - "path": [] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "S1" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O2" - }, - "name": "unnamedWire#175", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O0" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I00" - }, - "name": "unnamedWire#176", - "path": [] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "IN" - }, - "name": "unnamedWire#177", - "path": [ - { - "x": 545.0, - "y": 710.0 - }, - { - "x": 545.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "QIO0_MUX" - }, - "name": "unnamedWire#178", - "path": [ - { - "x": 445.0, - "y": 720.0 - }, - { - "x": 445.0, - "y": 580.0 - }, - { - "x": 175.0, - "y": 580.0 - }, - { - "x": 175.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#36", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "name": "unnamedWire#179", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "IN" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O1" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 5.0, - "y": 100.0 - }, - { - "x": 5.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I10" - }, - "name": "unnamedWire#180", - "path": [ - { - "x": 435.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I01" - }, - "name": "unnamedWire#181", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I11" - }, - "name": "unnamedWire#182", - "path": [ - { - "x": 440.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O0" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#183", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "S0" - }, - "name": "unnamedWire#184", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#185", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "I000" - }, - "name": "unnamedWire#186", - "path": [] - }, - { - "pin1": { - "compName": "mux3#1", - "pinName": "I001" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#187", - "path": [ - { - "x": 150.0, - "y": 685.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "SIOn_MUX" - }, - "name": "unnamedWire#188", - "path": [ - { - "x": 130.0, - "y": 655.0 - }, - { - "x": 130.0, - "y": 580.0 - }, - { - "x": 170.0, - "y": 580.0 - }, - { - "x": 170.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O2" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "S2" - }, - "name": "unnamedWire#189", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "IC" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O1" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "S1" - }, - "name": "unnamedWire#190", - "path": [] - }, - { - "pin1": { - "compName": "mux3#1", - "pinName": "I010" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#191", - "path": [ - { - "x": 105.0, - "y": 695.0 - }, - { - "x": 105.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "I011" - }, - "name": "unnamedWire#192", - "path": [ - { - "x": 110.0, - "y": 615.0 - }, - { - "x": 110.0, - "y": 705.0 - } - ] - }, - { - "pin1": { - "compName": "mux3#1", - "pinName": "I100" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#193", - "path": [ - { - "x": 115.0, - "y": 715.0 - }, - { - "x": 115.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "xor#3", - "pinName": "Y" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "I111" - }, - "name": "unnamedWire#194", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#195", - "path": [ - { - "x": 465.0, - "y": 495.0 - }, - { - "x": 345.0, - "y": 495.0 - }, - { - "x": 345.0, - "y": 585.0 - } - ] - }, - { - "pin1": { - "compName": "mux3#1", - "pinName": "I110" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O1" - }, - "name": "unnamedWire#196", - "path": [ - { - "x": 125.0, - "y": 735.0 - }, - { - "x": 125.0, - "y": 605.0 - }, - { - "x": 350.0, - "y": 605.0 - }, - { - "x": 350.0, - "y": 500.0 - }, - { - "x": 470.0, - "y": 500.0 - }, - { - "x": 470.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#2", - "pinName": "I01" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#197", - "path": [ - { - "x": 290.0, - "y": 675.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#2", - "pinName": "I10" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#198", - "path": [ - { - "x": 295.0, - "y": 685.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "I101" - }, - "name": "unnamedWire#199", - "path": [ - { - "x": 120.0, - "y": 585.0 - }, - { - "x": 120.0, - "y": 725.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_OVRRET" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "OVRRET" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 345.0, - "y": 210.0 - }, - { - "x": 345.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "IZ" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O3" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 5.0, - "y": 50.0 - }, - { - "x": 5.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "xor#1", - "pinName": "B" - }, - "name": "unnamedWire#200", - "path": [ - { - "x": 465.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "mux2#2", - "pinName": "I11" - }, - "name": "unnamedWire#201", - "path": [ - { - "x": 300.0, - "y": 695.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "OEn" - }, - "name": "unnamedWire#202", - "path": [ - { - "x": 250.0, - "y": 540.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "OE0" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#203", - "path": [ - { - "x": 390.0, - "y": 550.0 - }, - { - "x": 390.0, - "y": 585.0 - }, - { - "x": 560.0, - "y": 585.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "xor#1", - "pinName": "A" - }, - "name": "unnamedWire#204", - "path": [ - { - "x": 460.0, - "y": 325.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "xor#3", - "pinName": "A" - }, - "name": "unnamedWire#205", - "path": [ - { - "x": 460.0, - "y": 490.0 - }, - { - "x": 340.0, - "y": 490.0 - }, - { - "x": 340.0, - "y": 600.0 - }, - { - "x": 100.0, - "y": 600.0 - }, - { - "x": 100.0, - "y": 745.0 - } - ] - }, - { - "pin1": { - "compName": "xor#3", - "pinName": "B" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O0" - }, - "name": "unnamedWire#206", - "path": [ - { - "x": 95.0, - "y": 755.0 - }, - { - "x": 95.0, - "y": 590.0 - }, - { - "x": 355.0, - "y": 590.0 - }, - { - "x": 355.0, - "y": 505.0 - }, - { - "x": 475.0, - "y": 505.0 - }, - { - "x": 475.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#2", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "IN" - }, - "name": "unnamedWire#207", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O2" - }, - "pin2": { - "compName": "mux2#2", - "pinName": "S1" - }, - "name": "unnamedWire#208", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O1" - }, - "pin2": { - "compName": "mux2#2", - "pinName": "S0" - }, - "name": "unnamedWire#209", - "path": [] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_CINV" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "CINV" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 340.0, - "y": 220.0 - }, - { - "x": 340.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "I" - }, - "pin2": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "QIOn_MUX" - }, - "name": "unnamedWire#210", - "path": [ - { - "x": 305.0, - "y": 655.0 - }, - { - "x": 305.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O0" - }, - "pin2": { - "compName": "mux2#2", - "pinName": "I00" - }, - "name": "unnamedWire#211", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "IN" - }, - "pin2": { - "compName": "mux3#1", - "pinName": "Y" - }, - "name": "unnamedWire#212", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_SE" - }, - "pin2": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "_SE" - }, - "name": "unnamedWire#213", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#3", - "pinName": "EN" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#214", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "EN" - }, - "name": "unnamedWire#215", - "path": [ - { - "x": 575.0, - "y": 620.0 - }, - { - "x": 575.0, - "y": 645.0 - }, - { - "x": 560.0, - "y": 645.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "M" - }, - "name": "unnamedWire#216", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#32", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "I" - }, - "name": "unnamedWire#217", - "path": [ - { - "x": 405.0, - "y": 240.0 - }, - { - "x": 440.0, - "y": 240.0 - }, - { - "x": 440.0, - "y": 315.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "EN" - }, - "pin2": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "name": "unnamedWire#218", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "EN" - }, - "name": "unnamedWire#219", - "path": [ - { - "x": 410.0, - "y": 630.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 105.0, - "y": 80.0 - }, - { - "x": 105.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "name": "unnamedWire#220", - "path": [ - { - "x": 440.0, - "y": 595.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#5", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#4", - "pinName": "I0" - }, - "name": "unnamedWire#221", - "path": [] - }, - { - "pin1": { - "compName": "mux1#4", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "COVD_V" - }, - "name": "unnamedWire#222", - "path": [ - { - "x": 530.0, - "y": 535.0 - }, - { - "x": 530.0, - "y": 525.0 - }, - { - "x": 230.0, - "y": 525.0 - }, - { - "x": 230.0, - "y": 310.0 - }, - { - "x": 295.0, - "y": 310.0 - }, - { - "x": 295.0, - "y": 85.0 - }, - { - "x": 275.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#2", - "pinName": "OUT" - }, - "name": "unnamedWire#223", - "path": [ - { - "x": 265.0, - "y": 645.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#4", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "name": "unnamedWire#224", - "path": [ - { - "x": 585.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "MC_MUX" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "I" - }, - "name": "unnamedWire#226", - "path": [ - { - "x": 410.0, - "y": 560.0 - }, - { - "x": 410.0, - "y": 540.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1#5", - "pinName": "S0" - }, - "name": "unnamedWire#227", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1#4", - "pinName": "S0" - }, - "name": "unnamedWire#228", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#34", - "pinName": "" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I11" - }, - "name": "unnamedWire#229", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "I" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#35", - "pinName": "" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I01" - }, - "name": "unnamedWire#230", - "path": [ - { - "x": 430.0, - "y": 740.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "name": "unnamedWire#231", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#37", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#1", - "pinName": "OUT" - }, - "name": "unnamedWire#232", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#233", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "name": "unnamedWire#234", - "path": [ - { - "x": 550.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_OECT" - }, - "name": "unnamedWire#235", - "path": [ - { - "x": 550.0, - "y": 215.0 - }, - { - "x": 565.0, - "y": 215.0 - }, - { - "x": 565.0, - "y": 25.0 - }, - { - "x": 550.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#5", - "pinName": "OUT" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "CT" - }, - "name": "unnamedWire#236", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#5", - "pinName": "IN" - }, - "pin2": { - "compName": "xor#0", - "pinName": "Y" - }, - "name": "unnamedWire#237", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "mux1#5", - "pinName": "I0" - }, - "name": "unnamedWire#238", - "path": [ - { - "x": 430.0, - "y": 555.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#239", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 190.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QIO0" - }, - "name": "unnamedWire#240", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#41", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#40", - "pinName": "" - }, - "name": "unnamedWire#242", - "path": [ - { - "x": 585.0, - "y": 615.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904MSR#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 300.0, - "y": 110.0 - }, - { - "x": 300.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "I" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "Am2904muSR#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 405.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#33", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "I" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "C" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 255.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "C" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 300.0, - "y": 60.0 - }, - { - "x": 300.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "MSR_MUX" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "MUX" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 200.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904ShiftInstrDecode#0", - "pinName": "MC_EN" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "COVD_EN" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 225.0, - "y": 570.0 - }, - { - "x": 225.0, - "y": 305.0 - }, - { - "x": 290.0, - "y": 305.0 - }, - { - "x": 290.0, - "y": 80.0 - }, - { - "x": 265.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 225.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_CEmu" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O0" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 320.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "_EOVR" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 390.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "_EN" - }, - "name": "unnamedWire#44", - "path": [ - { - "x": 380.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904muSR#0", - "pinName": "_EC" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 370.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904muSR#0", - "pinName": "_EZ" - }, - "name": "unnamedWire#46", - "path": [ - { - "x": 360.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "B" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_WEZ" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 305.0, - "y": 30.0 - }, - { - "x": 305.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_WEC" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 310.0, - "y": 240.0 - }, - { - "x": 310.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "YZ" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 595.0, - "y": 40.0 - }, - { - "x": 595.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YC" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "YN" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 595.0, - "y": 60.0 - }, - { - "x": 595.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YOVR" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#52", - "path": [ - { - "x": 590.0, - "y": 100.0 - }, - { - "x": 590.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "Y" - }, - "name": "unnamedWire#54", - "path": [ - { - "x": 570.0, - "y": 50.0 - }, - { - "x": 415.0, - "y": 50.0 - }, - { - "x": 415.0, - "y": 180.0 - }, - { - "x": 195.0, - "y": 180.0 - }, - { - "x": 195.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 135.0, - "y": 10.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_CEM" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 25.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "B" - }, - "pin2": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_WEN" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 315.0, - "y": 70.0 - }, - { - "x": 315.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "muSR_WEOVR" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 320.0, - "y": 260.0 - }, - { - "x": 320.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O2" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 180.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#61", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "_EOVR" - }, - "name": "unnamedWire#66", - "path": [ - { - "x": 245.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Am2904MSR#0", - "pinName": "_EN" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 235.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "_EC" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 225.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2904MSR#0", - "pinName": "_EZ" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 215.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#70", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 170.0, - "y": 45.0 - }, - { - "x": 170.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "B" - }, - "pin2": { - "compName": "not4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 175.0, - "y": 45.0 - }, - { - "x": 175.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#73", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 175.0, - "y": 75.0 - }, - { - "x": 175.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_EZ" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 50.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A2" - }, - "name": "unnamedWire#76", - "path": [ - { - "x": 75.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_EN" - }, - "name": "unnamedWire#77", - "path": [ - { - "x": 100.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EOVR" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A4" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 125.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 570.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O4" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#80", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 450.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_OEY" - }, - "name": "unnamedWire#82", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "Y" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#83", - "path": [] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 550.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#85", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y2" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y4" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O1" - }, - "name": "unnamedWire#90", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O3" - }, - "name": "unnamedWire#92", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "I" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "Am2904RegCTInstrDecode#0", - "pinName": "Y_MUX" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#94", - "path": [ - { - "x": 190.0, - "y": 275.0 - }, - { - "x": 360.0, - "y": 275.0 - }, - { - "x": 360.0, - "y": 225.0 - }, - { - "x": 420.0, - "y": 225.0 - }, - { - "x": 420.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "S0" - }, - "name": "unnamedWire#95", - "path": [ - { - "x": 455.0, - "y": 100.0 - }, - { - "x": 455.0, - "y": 130.0 - }, - { - "x": 435.0, - "y": 130.0 - }, - { - "x": 435.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "name": "unnamedWire#99", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2904", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "msr": { - "id": "delegating", - "params": { - "delegateTarget": "Am2904MSR#0" - } - }, - "musr": { - "id": "delegating", - "params": { - "delegateTarget": "Am2904muSR#0" - } - } - }, - "atomicHighLevelStates": {} - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json deleted file mode 100644 index 927d41f8..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ /dev/null @@ -1,1936 +0,0 @@ -{ - "width": 80.0, - "height": 75.0, - "interfacePins": [ - { - "location": { - "x": 50.0, - "y": 0.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 60.0, - "y": 0.0 - }, - "name": "COVD_EN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 70.0, - "y": 0.0 - }, - "name": "COVD_V", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "I", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 70.0 - }, - "name": "MUX", - "logicWidth": 3, - "usage": "INPUT" - }, - { - "location": { - "x": 80.0, - "y": 20.0 - }, - "name": "Q", - "logicWidth": 4, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 30.0 - }, - "name": "Y", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 20.0, - "y": 0.0 - }, - "name": "_EC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 30.0, - "y": 0.0 - }, - "name": "_EN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 40.0, - "y": 0.0 - }, - "name": "_EOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 0.0 - }, - "name": "_EZ", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "mu", - "logicWidth": 4, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 170.0, - "y": 55.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 35.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 5.0, - "y": 135.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 45.0, - "y": 340.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 5.0, - "y": 235.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 385.0, - "y": 85.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 19.0, - "y": 224.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 364.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 74.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 74.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 34.0, - "y": 234.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 124.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 74.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 164.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 269.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 369.0, - "y": 94.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 374.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 379.0, - "y": 114.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 29.0, - "y": 284.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 39.0, - "y": 304.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 19.0, - "y": 194.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 79.0, - "y": 254.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 39.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 195.0, - "y": 50.0 - } - }, - { - "id": "dff4_finewe", - "name": "dff4_finewe#0", - "pos": { - "x": 325.0, - "y": 80.0 - } - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 280.0, - "y": 175.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 45.0, - "y": 80.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#1", - "pos": { - "x": 85.0, - "y": 220.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#2", - "pos": { - "x": 90.0, - "y": 30.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#3", - "pos": { - "x": 130.0, - "y": 170.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#4", - "pos": { - "x": 175.0, - "y": 120.0 - } - }, - { - "id": "not4", - "name": "not4#0", - "pos": { - "x": 45.0, - "y": 270.0 - } - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 40.0, - "y": 190.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 250.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EOVR" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE4" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 200.0, - "y": 30.0 - }, - { - "x": 305.0, - "y": 30.0 - }, - { - "x": 305.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "mu" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 35.0, - "y": 95.0 - }, - { - "x": 35.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 30.0, - "y": 45.0 - }, - { - "x": 30.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 25.0, - "y": 55.0 - }, - { - "x": 25.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 20.0, - "y": 65.0 - }, - { - "x": 20.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EN" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE3" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 150.0, - "y": 25.0 - }, - { - "x": 310.0, - "y": 25.0 - }, - { - "x": 310.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "MUX" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "I" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 30.0, - "y": 245.0 - }, - { - "x": 30.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 60.0, - "y": 360.0 - }, - { - "x": 60.0, - "y": 335.0 - }, - { - "x": 20.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "Q4" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 100.0, - "y": 20.0 - }, - { - "x": 190.0, - "y": 20.0 - }, - { - "x": 190.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_1" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_2" - }, - "pin2": { - "compName": "not4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_3" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_4" - }, - "pin2": { - "compName": "not4#0", - "pinName": "Y4" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A1" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 365.0, - "y": 315.0 - }, - { - "x": 25.0, - "y": 315.0 - }, - { - "x": 25.0, - "y": 275.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 370.0, - "y": 320.0 - }, - { - "x": 30.0, - "y": 320.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A3" - }, - "name": "unnamedWire#36", - "path": [ - { - "x": 375.0, - "y": 325.0 - }, - { - "x": 35.0, - "y": 325.0 - }, - { - "x": 35.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 380.0, - "y": 330.0 - }, - { - "x": 40.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_4" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [ - { - "x": 30.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EZ" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE1" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 50.0, - "y": 15.0 - }, - { - "x": 320.0, - "y": 15.0 - }, - { - "x": 320.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_2" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 40.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_3" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 20.0, - "y": 175.0 - }, - { - "x": 40.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "S0" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "I1_1" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 40.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "I1_2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "I1_3" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "I1_4" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "I0_4" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "I0_3" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "I0_2" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "I0_1" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#54", - "path": [ - { - "x": 75.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_1" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "I0_1" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 35.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "I0_2" - }, - "pin2": { - "compName": "xor#0", - "pinName": "Y" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "I0_3" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 80.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "I0_4" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 25.0, - "y": 265.0 - }, - { - "x": 25.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "I1_1" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "I1_2" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y2" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "I1_3" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "I1_4" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y4" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 125.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "S0" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "S0" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 85.0, - "y": 175.0 - }, - { - "x": 85.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "Y4" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "D4" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 235.0, - "y": 155.0 - }, - { - "x": 235.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D3" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "Y3" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 240.0, - "y": 155.0 - }, - { - "x": 240.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE2" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 235.0, - "y": 55.0 - }, - { - "x": 235.0, - "y": 20.0 - }, - { - "x": 315.0, - "y": 20.0 - }, - { - "x": 315.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D1" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "Y1" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 250.0, - "y": 135.0 - }, - { - "x": 250.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "I1_4" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "Y4" - }, - "name": "unnamedWire#74", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "I1_3" - }, - "name": "unnamedWire#75", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "I1_2" - }, - "pin2": { - "compName": "mux1_4#3", - "pinName": "Y2" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#3", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "I1_1" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "I0_4" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "Y4" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 140.0, - "y": 165.0 - }, - { - "x": 140.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "I0_3" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 145.0, - "y": 55.0 - }, - { - "x": 145.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "I0_2" - }, - "pin2": { - "compName": "mux1_4#2", - "pinName": "Y2" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 150.0, - "y": 145.0 - }, - { - "x": 150.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "I0_1" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 155.0, - "y": 35.0 - }, - { - "x": 155.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "S0" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 170.0, - "y": 340.0 - }, - { - "x": 170.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#83", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "COVD_EN" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 300.0, - "y": 10.0 - }, - { - "x": 270.0, - "y": 10.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 165.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "COVD_V" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 350.0, - "y": 70.0 - }, - { - "x": 265.0, - "y": 70.0 - }, - { - "x": 265.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#4", - "pinName": "Y2" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 245.0, - "y": 135.0 - }, - { - "x": 245.0, - "y": 145.0 - }, - { - "x": 275.0, - "y": 145.0 - }, - { - "x": 275.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "D2" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 320.0, - "y": 180.0 - }, - { - "x": 320.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 165.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "S0" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 270.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#93", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "MSR", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "dff4_finewe#0", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json deleted file mode 100644 index 2c007e54..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json +++ /dev/null @@ -1,774 +0,0 @@ -{ - "width": 60.0, - "height": 90.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "I", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 60.0, - "y": 10.0 - }, - "name": "Y000", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 20.0 - }, - "name": "Y001", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 30.0 - }, - "name": "Y010", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 40.0 - }, - "name": "Y011", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 50.0 - }, - "name": "Y100", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 60.0 - }, - "name": "Y101", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 70.0 - }, - "name": "Y110", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 60.0, - "y": 80.0 - }, - "name": "Y111", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 85.0, - "y": 20.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 45.0, - "y": 50.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 120.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 45.0, - "y": 105.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 80.0, - "y": 115.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 80.0, - "y": 165.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 110.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 29.0, - "y": 129.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 34.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 39.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 79.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 79.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 19.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 24.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 39.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 74.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 74.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 24.0, - "y": 149.0 - }, - "params": 1 - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 40.0, - "y": 20.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "A" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 110.0, - "y": 20.0 - }, - { - "x": 110.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 20.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 40.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 115.0, - "y": 60.0 - }, - { - "x": 115.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y001" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 80.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y000" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 25.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y011" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 35.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y010" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y100" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 70.0, - "y": 115.0 - }, - { - "x": 70.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Y101" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Y110" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "xor#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 30.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 75.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 40.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 25.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Y111" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 30.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 20.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 35.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Test\nlogic", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json deleted file mode 100644 index 2949d8da..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ /dev/null @@ -1,1128 +0,0 @@ -{ - "width": 50.0, - "height": 65.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "CINV", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 40.0 - }, - "name": "I", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 30.0 - }, - "name": "M", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "MUX", - "logicWidth": 2, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 60.0 - }, - "name": "OVRRET", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 50.0, - "y": 10.0 - }, - "name": "Q", - "logicWidth": 4, - "usage": "OUTPUT" - }, - { - "location": { - "x": 20.0, - "y": 0.0 - }, - "name": "_EC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 30.0, - "y": 0.0 - }, - "name": "_EN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 40.0, - "y": 0.0 - }, - "name": "_EOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 0.0 - }, - "name": "_EZ", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 155.0, - "y": 135.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 125.0, - "y": 150.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 125.0, - "y": 130.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 135.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 5.0, - "y": 185.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 5.0, - "y": 95.0 - }, - "params": { - "logicWidth": 2, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 230.0, - "y": 30.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 19.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 59.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 59.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 224.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 114.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 59.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "dff4_finewe", - "name": "dff4_finewe#0", - "pos": { - "x": 185.0, - "y": 25.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 25.0, - "y": 125.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#1", - "pos": { - "x": 65.0, - "y": 75.0 - } - }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 130.0, - "y": 105.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "Q2" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 20.0, - "y": 210.0 - }, - { - "x": 20.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 20.0, - "y": 165.0 - }, - { - "x": 20.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 20.0, - "y": 155.0 - }, - { - "x": 20.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 20.0, - "y": 145.0 - }, - { - "x": 20.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "MUX" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 20.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_4" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I1_3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_2" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "Q3" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I1_1" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_1" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 60.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_2" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "I0_3" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "I0_4" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 20.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "S0" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 20.0, - "y": 95.0 - }, - { - "x": 20.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "B" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 150.0, - "y": 150.0 - }, - { - "x": 150.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "OVRRET" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 115.0, - "y": 300.0 - }, - { - "x": 115.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 225.0, - "y": 175.0 - }, - { - "x": 120.0, - "y": 175.0 - }, - { - "x": 120.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "xor#0", - "pinName": "A" - }, - "name": "unnamedWire#34", - "path": [ - { - "x": 125.0, - "y": 90.0 - }, - { - "x": 125.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "CINV" - }, - "pin2": { - "compName": "xor#0", - "pinName": "B" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 105.0, - "y": 250.0 - }, - { - "x": 105.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "_WE1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_EZ" - }, - "name": "unnamedWire#36", - "path": [ - { - "x": 180.0, - "y": 40.0 - }, - { - "x": 180.0, - "y": 5.0 - }, - { - "x": 50.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "C" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 55.0, - "y": 50.0 - }, - { - "x": 55.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EOVR" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE4" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 200.0, - "y": 20.0 - }, - { - "x": 165.0, - "y": 20.0 - }, - { - "x": 165.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "_WE3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_EN" - }, - "name": "unnamedWire#39", - "path": [ - { - "x": 170.0, - "y": 60.0 - }, - { - "x": 170.0, - "y": 15.0 - }, - { - "x": 150.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 245.0, - "y": 45.0 - }, - { - "x": 245.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "_WE2" - }, - "name": "unnamedWire#40", - "path": [ - { - "x": 100.0, - "y": 10.0 - }, - { - "x": 175.0, - "y": 10.0 - }, - { - "x": 175.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D1" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y1" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "xor#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "D2" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 170.0, - "y": 110.0 - }, - { - "x": 170.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "dff4_finewe#0", - "pinName": "D3" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y3" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#1", - "pinName": "Y4" - }, - "name": "unnamedWire#44", - "path": [ - { - "x": 115.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff4_finewe#0", - "pinName": "D4" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 180.0, - "y": 145.0 - }, - { - "x": 180.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 115.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 20.0, - "y": 135.0 - }, - { - "x": 20.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "M" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 20.0, - "y": 185.0 - }, - { - "x": 20.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 190.0 - }, - { - "x": 20.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 20.0, - "y": 205.0 - }, - { - "x": 20.0, - "y": 200.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "ÂµSR", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "dff4_finewe#0", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json deleted file mode 100644 index 9a6e0ba7..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json +++ /dev/null @@ -1,1159 +0,0 @@ -{ - "width": 60.0, - "height": 45.0, - "interfacePins": [ - { - "location": { - "x": 40.0, - "y": 0.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 60.0, - "y": 30.0 - }, - "name": "CI", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 30.0, - "y": 0.0 - }, - "name": "D", - "logicWidth": 12, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "Y", - "logicWidth": 12, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "_CC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "_CCEN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 60.0, - "y": 5.0 - }, - "name": "_FULL", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 15.0, - "y": 45.0 - }, - "name": "_MAP", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 40.0, - "y": 45.0 - }, - "name": "_OE", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 45.0 - }, - "name": "_PL", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "_RLD", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 20.0, - "y": 45.0 - }, - "name": "_VECT", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Am2910InstrPLA", - "name": "Am2910InstrPLA#0", - "pos": { - "x": 70.0, - "y": 90.0 - } - }, - { - "id": "Am2910RegCntr", - "name": "Am2910RegCntr#0", - "pos": { - "x": 130.0, - "y": 15.0 - } - }, - { - "id": "Am2910SP", - "name": "Am2910SP#0", - "pos": { - "x": 240.0, - "y": 10.0 - } - }, - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 40.0, - "y": 45.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 10.0, - "y": 60.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 205.0, - "y": 195.0 - }, - "params": 1 - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 165.0, - "y": 180.0 - }, - "params": { - "logicWidth": 12, - "orientation": "DOWN" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 259.0, - "y": 99.0 - }, - "params": 12 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 224.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 174.0, - "y": 174.0 - }, - "params": 12 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 164.0, - "y": 59.0 - }, - "params": 12 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 149.0, - "y": 9.0 - }, - "params": 12 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 4.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 234.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 199.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 234.0, - "y": 69.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 199.0, - "y": 209.0 - }, - "params": 1 - }, - { - "id": "dff12", - "name": "dff12#0", - "pos": { - "x": 240.0, - "y": 105.0 - } - }, - { - "id": "inc", - "name": "inc#0", - "pos": { - "x": 240.0, - "y": 140.0 - }, - "params": 12 - }, - { - "id": "nor12", - "name": "nor12#0", - "pos": { - "x": 175.0, - "y": 50.0 - } - }, - { - "id": "ram5_12", - "name": "ram5_12#0", - "pos": { - "x": 240.0, - "y": 55.0 - } - }, - { - "id": "sel4_12", - "name": "sel4_12#0", - "pos": { - "x": 135.0, - "y": 110.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "YD" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "SA" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "YR" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "SB" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "nor12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2910InstrPLA#0", - "pinName": "R\u003d0" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 215.0, - "y": 60.0 - }, - { - "x": 215.0, - "y": 75.0 - }, - { - "x": 85.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "RWE" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "WE" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 105.0, - "y": 95.0 - }, - { - "x": 105.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "RDEC" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "DEC" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 110.0, - "y": 105.0 - }, - { - "x": 110.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "STKI0" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 225.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "STKI1" - }, - "pin2": { - "compName": "Am2910SP#0", - "pinName": "STKI1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 230.0, - "y": 165.0 - }, - { - "x": 230.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "Am2910SP#0", - "pinName": "STKI0" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 225.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "ram5_12#0", - "pinName": "WE" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "sel4_12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "inc#0", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 260.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "ram5_12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "C" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 185.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "YF" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "SC" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "D" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 205.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "B" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "nor12#0", - "pinName": "D" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "D" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "A" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 125.0, - "y": 10.0 - }, - { - "x": 125.0, - "y": 65.0 - }, - { - "x": 145.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_RLD" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "_RLD" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 50.0, - "y": 25.0 - }, - { - "x": 50.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Am2910InstrPLA#0", - "pinName": "PASS" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 65.0, - "y": 55.0 - }, - { - "x": 65.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_CC" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "YmuPC" - }, - "pin2": { - "compName": "sel4_12#0", - "pinName": "SD" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_CCEN" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 5.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#33", - "path": [ - { - "x": 35.0, - "y": 70.0 - }, - { - "x": 35.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910SP#0", - "pinName": "_FULL" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_FULL" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dff12#0", - "pinName": "C" - }, - "name": "unnamedWire#35", - "path": [ - { - "x": 235.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "Am2910SP#0", - "pinName": "C" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "C" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "inc#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff12#0", - "pinName": "D" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "inc#0", - "pinName": "CI" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "CI" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "_PL" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_PL" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 75.0, - "y": 180.0 - }, - { - "x": 50.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "_MAP" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_MAP" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 85.0, - "y": 185.0 - }, - { - "x": 75.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "_VECT" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_VECT" - }, - "name": "unnamedWire#44", - "path": [ - { - "x": 95.0, - "y": 190.0 - }, - { - "x": 100.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I" - }, - "pin2": { - "compName": "Am2910InstrPLA#0", - "pinName": "I" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 35.0, - "y": 125.0 - }, - { - "x": 35.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "dff12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "ram5_12#0", - "pinName": "C" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_OE" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 200.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 230.0, - "y": 190.0 - }, - { - "x": 230.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "ram5_12#0", - "pinName": "D" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Am2910SP#0", - "pinName": "A" - }, - "pin2": { - "compName": "ram5_12#0", - "pinName": "A" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Am2910SP#0", - "pinName": "B" - }, - "pin2": { - "compName": "ram5_12#0", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Am2910RegCntr#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 150.0, - "y": 60.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "Am2910", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "mupc": { - "id": "delegating", - "params": { - "delegateTarget": "dff12#0" - } - }, - "r": { - "id": "delegating", - "params": { - "delegateTarget": "Am2910RegCntr#0" - } - }, - "sp": { - "id": "delegating", - "params": { - "delegateTarget": "Am2910SP#0" - } - }, - "stack": { - "id": "delegating", - "params": { - "delegateTarget": "ram5_12#0" - } - } - }, - "atomicHighLevelStates": {} - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json deleted file mode 100644 index 459bca8d..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 20.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 50.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 44.0, - "y": 24.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#1" - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 45.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 45.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#5" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "and", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json deleted file mode 100644 index b8c98863..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "width": 35.0, - "height": 50.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 71.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 24.0, - "y": 96.5 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 30.0, - "y": 7.5 - } - }, - { - "id": "and", - "name": "and#1", - "pos": { - "x": 30.0, - "y": 32.5 - } - }, - { - "id": "and", - "name": "and#2", - "pos": { - "x": 30.0, - "y": 57.5 - } - }, - { - "id": "and", - "name": "and#3", - "pos": { - "x": 30.0, - "y": 82.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "and#1", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 25.0, - "y": 22.5 - } - ] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "and#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "and#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "and#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "and#2", - "pinName": "A" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "and#3", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 25.0, - "y": 112.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "and#3", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "and#2", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and#1", - "pinName": "B" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "and41", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json deleted file mode 100644 index a2b45122..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json +++ /dev/null @@ -1,520 +0,0 @@ -{ - "width": 35.0, - "height": 90.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "C2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "C3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "C4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "and41", - "name": "and41#0", - "pos": { - "x": 15.0, - "y": 137.5 - } - }, - { - "id": "or_4", - "name": "or_4#0", - "pos": { - "x": 35.0, - "y": 37.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A1" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 10.0, - "y": 112.5 - }, - { - "x": 10.0, - "y": 142.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A2" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 137.5 - }, - { - "x": 5.0, - "y": 152.5 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 65.0, - "y": 152.5 - }, - { - "x": 65.0, - "y": 125.0 - }, - { - "x": 25.0, - "y": 125.0 - }, - { - "x": 25.0, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 60.0, - "y": 162.5 - }, - { - "x": 60.0, - "y": 130.0 - }, - { - "x": 20.0, - "y": 130.0 - }, - { - "x": 20.0, - "y": 102.5 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 55.0, - "y": 172.5 - }, - { - "x": 55.0, - "y": 135.0 - }, - { - "x": 15.0, - "y": 135.0 - }, - { - "x": 15.0, - "y": 112.5 - } - ] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 75.0, - "y": 42.5 - }, - { - "x": 75.0, - "y": 12.5 - } - ] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 80.0, - "y": 52.5 - }, - { - "x": 80.0, - "y": 37.5 - } - ] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "or_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 80.0, - "y": 72.5 - }, - { - "x": 80.0, - "y": 87.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A3" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A4" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 187.5 - }, - { - "x": 5.0, - "y": 172.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "and41#0", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 10.0, - "y": 212.5 - }, - { - "x": 10.0, - "y": 182.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C1" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 10.0, - "y": 12.5 - }, - { - "x": 10.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C2" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 5.0, - "y": 37.5 - }, - { - "x": 5.0, - "y": 52.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C3" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C4" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 5.0, - "y": 87.5 - }, - { - "x": 5.0, - "y": 72.5 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "or_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 70.0, - "y": 142.5 - }, - { - "x": 70.0, - "y": 120.0 - }, - { - "x": 30.0, - "y": 120.0 - }, - { - "x": 30.0, - "y": 82.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "andor414", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json deleted file mode 100644 index d8d7c36a..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json +++ /dev/null @@ -1,544 +0,0 @@ -{ - "width": 35.0, - "height": 40.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "S1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y00", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y01", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y10", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y11", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 10.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 6.5, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 6.5, - "y": 16.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 36.5, - "y": 61.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 4.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 4.0, - "y": 41.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 31.5, - "y": 66.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 31.5, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 34.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 40.0, - "y": 2.5 - } - }, - { - "id": "and", - "name": "and#1", - "pos": { - "x": 40.0, - "y": 27.5 - } - }, - { - "id": "and", - "name": "and#2", - "pos": { - "x": 40.0, - "y": 52.5 - } - }, - { - "id": "and", - "name": "and#3", - "pos": { - "x": 40.0, - "y": 77.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "and#0", - "pinName": "A" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 32.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "and#0", - "pinName": "B" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 35.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "and#1", - "pinName": "A" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 37.5, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "and#1", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 35.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "and#2", - "pinName": "A" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 32.5, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "and#2", - "pinName": "B" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "and#3", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 37.5, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "and#3", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 32.5, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 7.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "and#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y00" - }, - "name": "unnamedWire#20" - }, - { - "pin1": { - "compName": "and#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y01" - }, - "name": "unnamedWire#21" - }, - { - "pin1": { - "compName": "and#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y10" - }, - "name": "unnamedWire#22" - }, - { - "pin1": { - "compName": "and#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y11" - }, - "name": "unnamedWire#23" - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 7.5, - "y": 62.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 5.0, - "y": 67.5 - }, - { - "x": 32.5, - "y": 67.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "demux2", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json deleted file mode 100644 index 2c771c07..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json +++ /dev/null @@ -1,372 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "D", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "_Q", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 120.0, - "y": 20.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 9.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 19.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 94.0, - "y": 64.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 104.0, - "y": 34.0 - }, - "params": 1 - }, - { - "id": "_rsLatch", - "name": "_rsLatch#0", - "pos": { - "x": 40.0, - "y": 70.0 - } - }, - { - "id": "_rsLatch", - "name": "_rsLatch#1", - "pos": { - "x": 120.0, - "y": 45.0 - } - }, - { - "id": "nand3", - "name": "nand3#0", - "pos": { - "x": 40.0, - "y": 30.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_rsLatch#0", - "pinName": "_R" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "nand3#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "_rsLatch#1", - "pinName": "_R" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 105.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "_rsLatch#1", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#13" - }, - { - "pin1": { - "compName": "_rsLatch#1", - "pinName": "_Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_Q" - }, - "name": "unnamedWire#14" - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "B" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 10.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 145.0, - "y": 30.0 - }, - { - "x": 145.0, - "y": 10.0 - }, - { - "x": 20.0, - "y": 10.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_rsLatch#0", - "pinName": "_S" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 20.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "C" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_rsLatch#0", - "pinName": "_Q" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 95.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "A" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 30.0, - "y": 65.0 - }, - { - "x": 30.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "_rsLatch#1", - "pinName": "_S" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 95.0, - "y": 50.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "dff", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "_rsLatch#1", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json deleted file mode 100644 index 188770f4..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json +++ /dev/null @@ -1,1313 +0,0 @@ -{ - "width": 55.0, - "height": 45.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D", - "logicWidth": 12, - "usage": "INPUT" - }, - { - "location": { - "x": 55.0, - "y": 20.0 - }, - "name": "Q", - "logicWidth": 12, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 70.0, - "y": 45.0 - }, - "params": { - "logicWidth": 12, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 255.0, - "y": 45.0 - }, - "params": { - "logicWidth": 12, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 124.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 124.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 179.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 124.0, - "y": 114.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 124.0, - "y": 144.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 124.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 269.0, - "y": 99.0 - }, - "params": 12 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 179.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 179.0, - "y": 164.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 179.0, - "y": 44.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 179.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 185.0, - "y": 30.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 185.0, - "y": 60.0 - } - }, - { - "id": "dff", - "name": "dff#10", - "pos": { - "x": 185.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#11", - "pos": { - "x": 130.0, - "y": 100.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 130.0, - "y": 10.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 130.0, - "y": 40.0 - } - }, - { - "id": "dff", - "name": "dff#4", - "pos": { - "x": 130.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#5", - "pos": { - "x": 185.0, - "y": 150.0 - } - }, - { - "id": "dff", - "name": "dff#6", - "pos": { - "x": 185.0, - "y": 180.0 - } - }, - { - "id": "dff", - "name": "dff#7", - "pos": { - "x": 130.0, - "y": 160.0 - } - }, - { - "id": "dff", - "name": "dff#8", - "pos": { - "x": 130.0, - "y": 130.0 - } - }, - { - "id": "dff", - "name": "dff#9", - "pos": { - "x": 185.0, - "y": 90.0 - } - }, - { - "id": "mux1_12", - "name": "mux1_12#0", - "pos": { - "x": 15.0, - "y": 70.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 125.0, - "y": 5.0 - }, - { - "x": 180.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "dff#11", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#10", - "pinName": "D" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 115.0, - "y": 115.0 - }, - { - "x": 115.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "dff#8", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 110.0, - "y": 135.0 - }, - { - "x": 110.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#5", - "pinName": "D" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 105.0, - "y": 135.0 - }, - { - "x": 105.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "dff#7", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 100.0, - "y": 165.0 - }, - { - "x": 100.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#6", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 95.0, - "y": 155.0 - }, - { - "x": 95.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "mux1_12#0", - "pinName": "S" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 5.0, - "y": 100.0 - }, - { - "x": 5.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "mux1_12#0", - "pinName": "I1" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 5.0, - "y": 175.0 - }, - { - "x": 5.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_12#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "dff#3", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff#4", - "pinName": "C" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#11", - "pinName": "C" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dff#8", - "pinName": "C" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "mux1_12#0", - "pinName": "I0" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 90.0 - }, - { - "x": 10.0, - "y": 205.0 - }, - { - "x": 270.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dff#7", - "pinName": "C" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 125.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "dff#6", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 180.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dff#5", - "pinName": "C" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "dff#10", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dff#9", - "pinName": "C" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "dff#2", - "pinName": "D" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 85.0, - "y": 45.0 - }, - { - "x": 85.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 90.0, - "y": 35.0 - }, - { - "x": 90.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O11" - }, - "pin2": { - "compName": "dff#2", - "pinName": "Q" - }, - "name": "unnamedWire#53", - "path": [ - { - "x": 250.0, - "y": 45.0 - }, - { - "x": 250.0, - "y": 25.0 - }, - { - "x": 170.0, - "y": 25.0 - }, - { - "x": 170.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O10" - }, - "name": "unnamedWire#54", - "path": [ - { - "x": 240.0, - "y": 35.0 - }, - { - "x": 240.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O9" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 235.0, - "y": 65.0 - }, - { - "x": 235.0, - "y": 55.0 - }, - { - "x": 170.0, - "y": 55.0 - }, - { - "x": 170.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "dff#1", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O8" - }, - "name": "unnamedWire#56", - "path": [ - { - "x": 230.0, - "y": 65.0 - }, - { - "x": 230.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "dff#4", - "pinName": "Q" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 170.0, - "y": 85.0 - }, - { - "x": 170.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "dff#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "dff#11", - "pinName": "Q" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 225.0, - "y": 105.0 - }, - { - "x": 225.0, - "y": 115.0 - }, - { - "x": 170.0, - "y": 115.0 - }, - { - "x": 170.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "dff#3", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 95.0, - "y": 45.0 - }, - { - "x": 95.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#10", - "pinName": "Q" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 230.0, - "y": 115.0 - }, - { - "x": 230.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "dff#8", - "pinName": "Q" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 235.0, - "y": 125.0 - }, - { - "x": 235.0, - "y": 145.0 - }, - { - "x": 170.0, - "y": 145.0 - }, - { - "x": 170.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "dff#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 240.0, - "y": 155.0 - }, - { - "x": 240.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "dff#7", - "pinName": "Q" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 245.0, - "y": 145.0 - }, - { - "x": 245.0, - "y": 175.0 - }, - { - "x": 170.0, - "y": 175.0 - }, - { - "x": 170.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "dff#6", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 250.0, - "y": 185.0 - }, - { - "x": 250.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "dff#1", - "pinName": "D" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 100.0, - "y": 75.0 - }, - { - "x": 100.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "dff#4", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 105.0, - "y": 75.0 - }, - { - "x": 105.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "dff#9", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n12 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q12", - "q11", - "q10", - "q9", - "q8", - "q7", - "q6", - "q5", - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#6", - "subStateID": "q" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#7", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#5", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#8", - "subStateID": "q" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff#10", - "subStateID": "q" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff#11", - "subStateID": "q" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff#9", - "subStateID": "q" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff#4", - "subStateID": "q" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json deleted file mode 100644 index 6efc9033..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json +++ /dev/null @@ -1,1601 +0,0 @@ -{ - "width": 45.0, - "height": 55.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D", - "logicWidth": 16, - "usage": "INPUT" - }, - { - "location": { - "x": 45.0, - "y": 25.0 - }, - "name": "Q", - "logicWidth": 16, - "usage": "TRISTATE" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 50.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 210.0, - "y": 50.0 - }, - "params": { - "logicWidth": 16, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 64.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 64.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 114.0, - "y": 139.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 114.0, - "y": 229.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 114.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 114.0, - "y": 169.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 114.0, - "y": 199.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 64.0, - "y": 89.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 64.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 64.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 64.0, - "y": 209.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 64.0, - "y": 149.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 114.0, - "y": 79.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 114.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 70.0, - "y": 15.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 120.0, - "y": 35.0 - } - }, - { - "id": "dff", - "name": "dff#10", - "pos": { - "x": 120.0, - "y": 245.0 - } - }, - { - "id": "dff", - "name": "dff#11", - "pos": { - "x": 70.0, - "y": 225.0 - } - }, - { - "id": "dff", - "name": "dff#12", - "pos": { - "x": 70.0, - "y": 195.0 - } - }, - { - "id": "dff", - "name": "dff#13", - "pos": { - "x": 120.0, - "y": 155.0 - } - }, - { - "id": "dff", - "name": "dff#14", - "pos": { - "x": 120.0, - "y": 185.0 - } - }, - { - "id": "dff", - "name": "dff#15", - "pos": { - "x": 70.0, - "y": 165.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 120.0, - "y": 65.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 70.0, - "y": 45.0 - } - }, - { - "id": "dff", - "name": "dff#4", - "pos": { - "x": 120.0, - "y": 95.0 - } - }, - { - "id": "dff", - "name": "dff#5", - "pos": { - "x": 120.0, - "y": 125.0 - } - }, - { - "id": "dff", - "name": "dff#6", - "pos": { - "x": 70.0, - "y": 75.0 - } - }, - { - "id": "dff", - "name": "dff#7", - "pos": { - "x": 70.0, - "y": 105.0 - } - }, - { - "id": "dff", - "name": "dff#8", - "pos": { - "x": 70.0, - "y": 135.0 - } - }, - { - "id": "dff", - "name": "dff#9", - "pos": { - "x": 120.0, - "y": 215.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O15" - }, - "pin2": { - "compName": "dff#0", - "pinName": "D" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 20.0, - "y": 50.0 - }, - { - "x": 20.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "dff#1", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O14" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 25.0, - "y": 40.0 - }, - { - "x": 25.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "dff#15", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 45.0, - "y": 170.0 - }, - { - "x": 45.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#14", - "pinName": "D" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 40.0, - "y": 160.0 - }, - { - "x": 40.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "dff#12", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 35.0, - "y": 200.0 - }, - { - "x": 35.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#9", - "pinName": "D" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 30.0, - "y": 180.0 - }, - { - "x": 30.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "dff#11", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 25.0, - "y": 230.0 - }, - { - "x": 25.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#10", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 20.0, - "y": 200.0 - }, - { - "x": 20.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "C" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 30.0, - "y": 70.0 - }, - { - "x": 30.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#6", - "pinName": "C" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "dff#7", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dff#8", - "pinName": "C" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff#15", - "pinName": "C" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dff#12", - "pinName": "C" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 35.0, - "y": 70.0 - }, - { - "x": 35.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dff#11", - "pinName": "C" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 65.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "dff#10", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 115.0, - "y": 260.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "dff#9", - "pinName": "C" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "dff#14", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "dff#13", - "pinName": "C" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "dff#5", - "pinName": "C" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "dff#6", - "pinName": "D" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 40.0, - "y": 90.0 - }, - { - "x": 40.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "dff#4", - "pinName": "C" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 65.0, - "y": 10.0 - }, - { - "x": 115.0, - "y": 10.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 10.0, - "y": 30.0 - }, - { - "x": 10.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O15" - }, - "pin2": { - "compName": "dff#0", - "pinName": "Q" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 200.0, - "y": 50.0 - }, - { - "x": 200.0, - "y": 30.0 - }, - { - "x": 110.0, - "y": 30.0 - }, - { - "x": 110.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "dff#4", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "dff#1", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O14" - }, - "name": "unnamedWire#50", - "path": [ - { - "x": 195.0, - "y": 40.0 - }, - { - "x": 195.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O13" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#51", - "path": [ - { - "x": 190.0, - "y": 70.0 - }, - { - "x": 190.0, - "y": 60.0 - }, - { - "x": 110.0, - "y": 60.0 - }, - { - "x": 110.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O12" - }, - "pin2": { - "compName": "dff#2", - "pinName": "Q" - }, - "name": "unnamedWire#52", - "path": [ - { - "x": 185.0, - "y": 80.0 - }, - { - "x": 185.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O11" - }, - "pin2": { - "compName": "dff#6", - "pinName": "Q" - }, - "name": "unnamedWire#53", - "path": [ - { - "x": 110.0, - "y": 90.0 - }, - { - "x": 110.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "dff#4", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O10" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O9" - }, - "pin2": { - "compName": "dff#7", - "pinName": "Q" - }, - "name": "unnamedWire#55", - "path": [ - { - "x": 160.0, - "y": 110.0 - }, - { - "x": 160.0, - "y": 120.0 - }, - { - "x": 110.0, - "y": 120.0 - }, - { - "x": 110.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "dff#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O8" - }, - "name": "unnamedWire#56", - "path": [ - { - "x": 165.0, - "y": 130.0 - }, - { - "x": 165.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "dff#8", - "pinName": "Q" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 170.0, - "y": 130.0 - }, - { - "x": 170.0, - "y": 150.0 - }, - { - "x": 110.0, - "y": 150.0 - }, - { - "x": 110.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "dff#13", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 175.0, - "y": 160.0 - }, - { - "x": 175.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "dff#15", - "pinName": "Q" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 180.0, - "y": 150.0 - }, - { - "x": 180.0, - "y": 180.0 - }, - { - "x": 110.0, - "y": 180.0 - }, - { - "x": 110.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "dff#7", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#14", - "pinName": "Q" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 185.0, - "y": 160.0 - }, - { - "x": 185.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "dff#12", - "pinName": "Q" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 190.0, - "y": 170.0 - }, - { - "x": 190.0, - "y": 210.0 - }, - { - "x": 110.0, - "y": 210.0 - }, - { - "x": 110.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "dff#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 195.0, - "y": 220.0 - }, - { - "x": 195.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "dff#11", - "pinName": "Q" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 200.0, - "y": 190.0 - }, - { - "x": 200.0, - "y": 240.0 - }, - { - "x": 110.0, - "y": 240.0 - }, - { - "x": 110.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "dff#10", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 205.0, - "y": 250.0 - }, - { - "x": 205.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "dff#5", - "pinName": "D" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 60.0, - "y": 120.0 - }, - { - "x": 60.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "dff#8", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 55.0, - "y": 140.0 - }, - { - "x": 55.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "dff#13", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 50.0, - "y": 140.0 - }, - { - "x": 50.0, - "y": 160.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n16 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q16", - "q15", - "q14", - "q13", - "q12", - "q11", - "q10", - "q9", - "q8", - "q7", - "q6", - "q5", - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#10", - "subStateID": "q" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dff#7", - "subStateID": "q" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dff#4", - "subStateID": "q" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dff#6", - "subStateID": "q" - } - }, - "q13": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q14": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - }, - "q15": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, - "q16": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#11", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#9", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#12", - "subStateID": "q" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff#14", - "subStateID": "q" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff#15", - "subStateID": "q" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff#13", - "subStateID": "q" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff#8", - "subStateID": "q" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dff#5", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json deleted file mode 100644 index 0d24ad3f..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json +++ /dev/null @@ -1,325 +0,0 @@ -{ - "width": 45.0, - "height": 55.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D", - "logicWidth": 16, - "usage": "INPUT" - }, - { - "location": { - "x": 45.0, - "y": 25.0 - }, - "name": "Q", - "logicWidth": 16, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "_WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 164.0, - "y": 99.0 - }, - "params": 16 - }, - { - "id": "dff16", - "name": "dff16#0", - "pos": { - "x": 110.0, - "y": 75.0 - } - }, - { - "id": "mux1_16", - "name": "mux1_16#0", - "pos": { - "x": 30.0, - "y": 75.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "mux1_16#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "D" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 95.0, - "y": 125.0 - }, - { - "x": 95.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "dff16#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "C" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 95.0, - "y": 20.0 - }, - { - "x": 95.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_WE" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "S" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I1" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 165.0, - "y": 205.0 - }, - { - "x": 10.0, - "y": 205.0 - }, - { - "x": 10.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I0" - }, - "name": "unnamedWire#68", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n16 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q" - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q1" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q10" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q11" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q12" - } - }, - "q13": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q13" - } - }, - "q14": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q14" - } - }, - "q15": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q15" - } - }, - "q16": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q16" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q2" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q3" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q4" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q5" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q6" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q7" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q8" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q9" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json deleted file mode 100644 index 09127e66..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json +++ /dev/null @@ -1,334 +0,0 @@ -{ - "width": 45.0, - "height": 55.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D", - "logicWidth": 16, - "usage": "INPUT" - }, - { - "location": { - "x": 45.0, - "y": 25.0 - }, - "name": "Q", - "logicWidth": 16, - "usage": "TRISTATE" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.25, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 164.0, - "y": 99.0 - }, - "params": 16 - }, - { - "id": "dff16", - "name": "dff16#0", - "pos": { - "x": 110.0, - "y": 75.0 - } - }, - { - "id": "mux1_16", - "name": "mux1_16#0", - "pos": { - "x": 30.0, - "y": 75.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "mux1_16#0", - "pinName": "Y" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "D" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 95.0, - "y": 125.0 - }, - { - "x": 95.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "dff16#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "dff16#0", - "pinName": "C" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 95.0, - "y": 20.0 - }, - { - "x": 95.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "S" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I0" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 165.0, - "y": 205.0 - }, - { - "x": 20.0, - "y": 205.0 - }, - { - "x": 20.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "mux1_16#0", - "pinName": "I1" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 10.0, - "y": 100.0 - }, - { - "x": 10.0, - "y": 165.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n16 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q" - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q1" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q10" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q11" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q12" - } - }, - "q13": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q13" - } - }, - "q14": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q14" - } - }, - "q15": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q15" - } - }, - "q16": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q16" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q2" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q3" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q4" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q5" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q6" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q7" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q8" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dff16#0", - "subStateID": "q9" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json deleted file mode 100644 index cd203617..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ /dev/null @@ -1,742 +0,0 @@ -{ - "width": 35.0, - "height": 60.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Q3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Q4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 104.0, - "y": 184.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 104.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 104.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 164.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 159.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 154.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 115.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 55.0, - "y": 60.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 105.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "dff#0", - "pinName": "D" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 100.0, - "y": 65.0 - }, - { - "x": 100.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 25.0, - "y": 25.0 - }, - { - "x": 25.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 20.0, - "y": 75.0 - }, - { - "x": 20.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 25.0, - "y": 125.0 - }, - { - "x": 25.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q1" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "Q" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 25.0, - "y": 175.0 - }, - { - "x": 25.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q3" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "dff#1", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q4" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "dff#2", - "pinName": "D" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 100.0, - "y": 85.0 - }, - { - "x": 100.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 95.0, - "y": 95.0 - }, - { - "x": 95.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 170.0, - "y": 205.0 - }, - { - "x": 50.0, - "y": 205.0 - }, - { - "x": 50.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 165.0, - "y": 210.0 - }, - { - "x": 45.0, - "y": 210.0 - }, - { - "x": 45.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 160.0, - "y": 215.0 - }, - { - "x": 40.0, - "y": 215.0 - }, - { - "x": 40.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 155.0, - "y": 220.0 - }, - { - "x": 35.0, - "y": 220.0 - }, - { - "x": 35.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "C" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 225.0 - }, - { - "x": 20.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 275.0 - }, - { - "x": 10.0, - "y": 65.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n4 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json deleted file mode 100644 index 005cabe4..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json +++ /dev/null @@ -1,742 +0,0 @@ -{ - "width": 35.0, - "height": 60.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Q3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Q4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "_WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 104.0, - "y": 184.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 104.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 104.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 164.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 159.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 154.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 115.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 55.0, - "y": 60.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 105.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "dff#0", - "pinName": "D" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 100.0, - "y": 65.0 - }, - { - "x": 100.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_1" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 25.0, - "y": 25.0 - }, - { - "x": 25.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_2" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 20.0, - "y": 75.0 - }, - { - "x": 20.0, - "y": 85.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 20.0, - "y": 125.0 - }, - { - "x": 20.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q1" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "Q" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0_4" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 25.0, - "y": 175.0 - }, - { - "x": 25.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q3" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "dff#1", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q4" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "dff#2", - "pinName": "D" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 100.0, - "y": 85.0 - }, - { - "x": 100.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "mux1_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 95.0, - "y": 95.0 - }, - { - "x": 95.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 170.0, - "y": 205.0 - }, - { - "x": 50.0, - "y": 205.0 - }, - { - "x": 50.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 165.0, - "y": 210.0 - }, - { - "x": 45.0, - "y": 210.0 - }, - { - "x": 45.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_3" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 160.0, - "y": 215.0 - }, - { - "x": 40.0, - "y": 215.0 - }, - { - "x": 40.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1_4" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 155.0, - "y": 220.0 - }, - { - "x": 35.0, - "y": 220.0 - }, - { - "x": 35.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "C" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 225.0 - }, - { - "x": 20.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_WE" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 275.0 - }, - { - "x": 10.0, - "y": 65.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n4 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json deleted file mode 100644 index 8c2a5b3b..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff8.json +++ /dev/null @@ -1,859 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D", - "logicWidth": 8, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q", - "logicWidth": 8, - "usage": "TRISTATE" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 40.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 160.0, - "y": 40.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 39.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 89.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 39.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 39.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 89.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 89.0, - "y": 44.0 - }, - "params": 1 - }, - { - "id": "dff", - "name": "dff#10", - "pos": { - "x": 95.0, - "y": 60.0 - } - }, - { - "id": "dff", - "name": "dff#11", - "pos": { - "x": 45.0, - "y": 40.0 - } - }, - { - "id": "dff", - "name": "dff#4", - "pos": { - "x": 45.0, - "y": 10.0 - } - }, - { - "id": "dff", - "name": "dff#5", - "pos": { - "x": 95.0, - "y": 90.0 - } - }, - { - "id": "dff", - "name": "dff#6", - "pos": { - "x": 95.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#7", - "pos": { - "x": 45.0, - "y": 100.0 - } - }, - { - "id": "dff", - "name": "dff#8", - "pos": { - "x": 45.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#9", - "pos": { - "x": 95.0, - "y": 30.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 40.0, - "y": 5.0 - }, - { - "x": 90.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "dff#11", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 30.0, - "y": 45.0 - }, - { - "x": 30.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#10", - "pinName": "D" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 25.0, - "y": 70.0 - }, - { - "x": 25.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "dff#8", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 25.0, - "y": 75.0 - }, - { - "x": 25.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#5", - "pinName": "D" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 25.0, - "y": 90.0 - }, - { - "x": 25.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "dff#7", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 25.0, - "y": 105.0 - }, - { - "x": 25.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#6", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 20.0, - "y": 110.0 - }, - { - "x": 20.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#11", - "pinName": "C" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dff#8", - "pinName": "C" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dff#7", - "pinName": "C" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 40.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "dff#6", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 90.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dff#5", - "pinName": "C" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "dff#10", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dff#9", - "pinName": "C" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#4", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "dff#4", - "pinName": "Q" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 155.0, - "y": 40.0 - }, - { - "x": 155.0, - "y": 25.0 - }, - { - "x": 85.0, - "y": 25.0 - }, - { - "x": 85.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "dff#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 150.0, - "y": 35.0 - }, - { - "x": 150.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "dff#11", - "pinName": "Q" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 145.0, - "y": 60.0 - }, - { - "x": 145.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "dff#10", - "pinName": "Q" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 140.0, - "y": 70.0 - }, - { - "x": 140.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "dff#8", - "pinName": "Q" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 140.0, - "y": 80.0 - }, - { - "x": 140.0, - "y": 85.0 - }, - { - "x": 85.0, - "y": 85.0 - }, - { - "x": 85.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "dff#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 140.0, - "y": 95.0 - }, - { - "x": 140.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "dff#7", - "pinName": "Q" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 140.0, - "y": 100.0 - }, - { - "x": 140.0, - "y": 115.0 - }, - { - "x": 85.0, - "y": 115.0 - }, - { - "x": 85.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "dff#6", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 150.0, - "y": 125.0 - }, - { - "x": 150.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "dff#4", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 15.0 - }, - { - "x": 20.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "dff#9", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 25.0, - "y": 50.0 - }, - { - "x": 25.0, - "y": 35.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n8 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q8", - "q7", - "q6", - "q5", - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#6", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#7", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#5", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#8", - "subStateID": "q" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff#10", - "subStateID": "q" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff#11", - "subStateID": "q" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff#9", - "subStateID": "q" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff#4", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json deleted file mode 100644 index e1f37bc6..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff80.json +++ /dev/null @@ -1,3563 +0,0 @@ -{ - "width": 25.0, - "height": 165.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "D", - "logicWidth": 80, - "usage": "INPUT" - }, - { - "location": { - "x": 25.0, - "y": 85.0 - }, - "name": "Q", - "logicWidth": 80, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 15.0, - "y": 30.0 - }, - "params": { - "logicWidth": 80, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 90.0, - "y": 750.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#10", - "pos": { - "x": 30.0, - "y": 670.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#11", - "pos": { - "x": 30.0, - "y": 750.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#12", - "pos": { - "x": 90.0, - "y": 510.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#13", - "pos": { - "x": 90.0, - "y": 590.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#14", - "pos": { - "x": 90.0, - "y": 110.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#15", - "pos": { - "x": 90.0, - "y": 430.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#16", - "pos": { - "x": 90.0, - "y": 190.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#17", - "pos": { - "x": 90.0, - "y": 350.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#18", - "pos": { - "x": 90.0, - "y": 270.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#19", - "pos": { - "x": 90.0, - "y": 670.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 30.0, - "y": 30.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#20", - "pos": { - "x": 90.0, - "y": 30.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#21", - "pos": { - "x": 105.0, - "y": 30.0 - }, - "params": { - "logicWidth": 80, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 30.0, - "y": 110.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 30.0, - "y": 190.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", - "pos": { - "x": 30.0, - "y": 270.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#6", - "pos": { - "x": 30.0, - "y": 350.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#7", - "pos": { - "x": 30.0, - "y": 430.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#8", - "pos": { - "x": 30.0, - "y": 510.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#9", - "pos": { - "x": 30.0, - "y": 590.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 44.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 44.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 44.0, - "y": 214.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 44.0, - "y": 294.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 44.0, - "y": 454.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 44.0, - "y": 374.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 44.0, - "y": 614.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 44.0, - "y": 534.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 44.0, - "y": 694.0 - }, - "params": 1 - }, - { - "id": "dff8", - "name": "dff8#0", - "pos": { - "x": 50.0, - "y": 770.0 - } - }, - { - "id": "dff8", - "name": "dff8#1", - "pos": { - "x": 50.0, - "y": 690.0 - } - }, - { - "id": "dff8", - "name": "dff8#2", - "pos": { - "x": 50.0, - "y": 610.0 - } - }, - { - "id": "dff8", - "name": "dff8#3", - "pos": { - "x": 50.0, - "y": 530.0 - } - }, - { - "id": "dff8", - "name": "dff8#4", - "pos": { - "x": 50.0, - "y": 450.0 - } - }, - { - "id": "dff8", - "name": "dff8#5", - "pos": { - "x": 50.0, - "y": 370.0 - } - }, - { - "id": "dff8", - "name": "dff8#6", - "pos": { - "x": 50.0, - "y": 290.0 - } - }, - { - "id": "dff8", - "name": "dff8#7", - "pos": { - "x": 50.0, - "y": 210.0 - } - }, - { - "id": "dff8", - "name": "dff8#8", - "pos": { - "x": 50.0, - "y": 130.0 - } - }, - { - "id": "dff8", - "name": "dff8#9", - "pos": { - "x": 50.0, - "y": 50.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O79" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O7" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O78" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O69" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O59" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O3" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O58" - }, - "name": "unnamedWire#101", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O57" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O1" - }, - "name": "unnamedWire#102", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O56" - }, - "name": "unnamedWire#103", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O55" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O7" - }, - "name": "unnamedWire#104", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O54" - }, - "name": "unnamedWire#105", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O53" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O5" - }, - "name": "unnamedWire#106", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O52" - }, - "name": "unnamedWire#107", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O51" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O3" - }, - "name": "unnamedWire#108", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O50" - }, - "name": "unnamedWire#109", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O68" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O49" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O1" - }, - "name": "unnamedWire#110", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O48" - }, - "name": "unnamedWire#111", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O47" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O7" - }, - "name": "unnamedWire#112", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O46" - }, - "name": "unnamedWire#113", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O45" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O5" - }, - "name": "unnamedWire#114", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O44" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O43" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O3" - }, - "name": "unnamedWire#116", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O42" - }, - "name": "unnamedWire#117", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O41" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O1" - }, - "name": "unnamedWire#118", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O40" - }, - "name": "unnamedWire#119", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O67" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O39" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O7" - }, - "name": "unnamedWire#120", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O38" - }, - "name": "unnamedWire#121", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O37" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O5" - }, - "name": "unnamedWire#122", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O36" - }, - "name": "unnamedWire#123", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O35" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O3" - }, - "name": "unnamedWire#124", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O34" - }, - "name": "unnamedWire#125", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O33" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O1" - }, - "name": "unnamedWire#126", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O32" - }, - "name": "unnamedWire#127", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O31" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O7" - }, - "name": "unnamedWire#128", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O30" - }, - "name": "unnamedWire#129", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O66" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O29" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O5" - }, - "name": "unnamedWire#130", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O28" - }, - "name": "unnamedWire#131", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O27" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O3" - }, - "name": "unnamedWire#132", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O26" - }, - "name": "unnamedWire#133", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O25" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O1" - }, - "name": "unnamedWire#134", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O24" - }, - "name": "unnamedWire#135", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O23" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O7" - }, - "name": "unnamedWire#136", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O22" - }, - "name": "unnamedWire#137", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O21" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O5" - }, - "name": "unnamedWire#138", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O20" - }, - "name": "unnamedWire#139", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O65" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O19" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O3" - }, - "name": "unnamedWire#140", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O18" - }, - "name": "unnamedWire#141", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O17" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O1" - }, - "name": "unnamedWire#142", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O16" - }, - "name": "unnamedWire#143", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O7" - }, - "name": "unnamedWire#144", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O14" - }, - "name": "unnamedWire#145", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O5" - }, - "name": "unnamedWire#146", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O12" - }, - "name": "unnamedWire#147", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O3" - }, - "name": "unnamedWire#148", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O10" - }, - "name": "unnamedWire#149", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O64" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O1" - }, - "name": "unnamedWire#150", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O8" - }, - "name": "unnamedWire#151", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "name": "unnamedWire#152", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O6" - }, - "name": "unnamedWire#153", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "name": "unnamedWire#154", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O4" - }, - "name": "unnamedWire#155", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "name": "unnamedWire#156", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O2" - }, - "name": "unnamedWire#157", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#158", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O0" - }, - "name": "unnamedWire#159", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O63" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O7" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#9", - "pinName": "D" - }, - "name": "unnamedWire#160", - "path": [] - }, - { - "pin1": { - "compName": "dff8#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "I" - }, - "name": "unnamedWire#161", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#8", - "pinName": "D" - }, - "name": "unnamedWire#162", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#7", - "pinName": "D" - }, - "name": "unnamedWire#163", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#6", - "pinName": "D" - }, - "name": "unnamedWire#164", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#5", - "pinName": "D" - }, - "name": "unnamedWire#165", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#4", - "pinName": "D" - }, - "name": "unnamedWire#166", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#3", - "pinName": "D" - }, - "name": "unnamedWire#167", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#2", - "pinName": "D" - }, - "name": "unnamedWire#168", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#1", - "pinName": "D" - }, - "name": "unnamedWire#169", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O62" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#0", - "pinName": "D" - }, - "name": "unnamedWire#170", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#0", - "pinName": "Q" - }, - "name": "unnamedWire#171", - "path": [] - }, - { - "pin1": { - "compName": "dff8#1", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "I" - }, - "name": "unnamedWire#172", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#2", - "pinName": "Q" - }, - "name": "unnamedWire#173", - "path": [] - }, - { - "pin1": { - "compName": "dff8#3", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "I" - }, - "name": "unnamedWire#174", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#4", - "pinName": "Q" - }, - "name": "unnamedWire#175", - "path": [] - }, - { - "pin1": { - "compName": "dff8#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "I" - }, - "name": "unnamedWire#176", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#6", - "pinName": "Q" - }, - "name": "unnamedWire#177", - "path": [] - }, - { - "pin1": { - "compName": "dff8#7", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "I" - }, - "name": "unnamedWire#178", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "I" - }, - "pin2": { - "compName": "dff8#8", - "pinName": "Q" - }, - "name": "unnamedWire#179", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O61" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O5" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#180", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "I" - }, - "name": "unnamedWire#181", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#182", - "path": [ - { - "x": 45.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff8#9", - "pinName": "C" - }, - "name": "unnamedWire#183", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff8#8", - "pinName": "C" - }, - "name": "unnamedWire#184", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#185", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#186", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff8#7", - "pinName": "C" - }, - "name": "unnamedWire#187", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#188", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dff8#6", - "pinName": "C" - }, - "name": "unnamedWire#189", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O60" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#190", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dff8#5", - "pinName": "C" - }, - "name": "unnamedWire#191", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#192", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dff8#4", - "pinName": "C" - }, - "name": "unnamedWire#193", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#194", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dff8#3", - "pinName": "C" - }, - "name": "unnamedWire#195", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#196", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dff8#2", - "pinName": "C" - }, - "name": "unnamedWire#197", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#198", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dff8#1", - "pinName": "C" - }, - "name": "unnamedWire#199", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O77" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O5" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O59" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dff8#0", - "pinName": "C" - }, - "name": "unnamedWire#200", - "path": [ - { - "x": 45.0, - "y": 775.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O58" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O57" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O56" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O55" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O7" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O54" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O53" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O5" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O52" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O51" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O3" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O50" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O76" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O49" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O1" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O48" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O47" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O7" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O46" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O45" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O5" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O44" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O43" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O3" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O42" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O41" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O1" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O40" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O75" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O39" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O7" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O38" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O37" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O5" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O36" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O35" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O3" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O34" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O33" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O1" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O32" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O31" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O7" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O30" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O74" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O29" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O5" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O28" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O27" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O3" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O26" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O25" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O1" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O24" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O23" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O7" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O22" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O21" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O5" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O20" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O73" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O19" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O3" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O18" - }, - "name": "unnamedWire#61", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O17" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O1" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O16" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O7" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O14" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O5" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "name": "unnamedWire#67", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O3" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "name": "unnamedWire#69", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O72" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O1" - }, - "name": "unnamedWire#70", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "name": "unnamedWire#71", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O7" - }, - "name": "unnamedWire#72", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "name": "unnamedWire#73", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O5" - }, - "name": "unnamedWire#74", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "name": "unnamedWire#75", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O3" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O1" - }, - "name": "unnamedWire#78", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#79", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O71" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O79" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O7" - }, - "name": "unnamedWire#80", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O78" - }, - "name": "unnamedWire#81", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O77" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O5" - }, - "name": "unnamedWire#82", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O76" - }, - "name": "unnamedWire#83", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O75" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O3" - }, - "name": "unnamedWire#84", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O74" - }, - "name": "unnamedWire#85", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O73" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O1" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O72" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O71" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O7" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O70" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O70" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O69" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O5" - }, - "name": "unnamedWire#90", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O68" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O67" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O3" - }, - "name": "unnamedWire#92", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O66" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O65" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O1" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O64" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O63" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O7" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O62" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O61" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O5" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O60" - }, - "name": "unnamedWire#99", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n80 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q80-73", - "q72-65", - "q64-57", - "q56-49", - "q48-41", - "q40-33", - "q32-25", - "q24-17", - "q16-9", - "q8-1" - ], - "vectorPartLengthes": [ - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q1" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q2" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q3" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q4" - } - }, - "q13": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q5" - } - }, - "q14": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q6" - } - }, - "q15": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q7" - } - }, - "q16": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q8" - } - }, - "q16-9": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q" - } - }, - "q17": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q1" - } - }, - "q18": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q2" - } - }, - "q19": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q3" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q2" - } - }, - "q20": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q4" - } - }, - "q21": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q5" - } - }, - "q22": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q6" - } - }, - "q23": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q7" - } - }, - "q24": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q8" - } - }, - "q24-17": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#2", - "subStateID": "q" - } - }, - "q25": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q1" - } - }, - "q26": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q2" - } - }, - "q27": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q3" - } - }, - "q28": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q4" - } - }, - "q29": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q5" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q3" - } - }, - "q30": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q6" - } - }, - "q31": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q7" - } - }, - "q32": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q8" - } - }, - "q32-25": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#3", - "subStateID": "q" - } - }, - "q33": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q1" - } - }, - "q34": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q2" - } - }, - "q35": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q3" - } - }, - "q36": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q4" - } - }, - "q37": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q5" - } - }, - "q38": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q6" - } - }, - "q39": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q7" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q4" - } - }, - "q40": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q8" - } - }, - "q40-33": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#4", - "subStateID": "q" - } - }, - "q41": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q1" - } - }, - "q42": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q2" - } - }, - "q43": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q3" - } - }, - "q44": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q4" - } - }, - "q45": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q5" - } - }, - "q46": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q6" - } - }, - "q47": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q7" - } - }, - "q48": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q8" - } - }, - "q48-41": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#5", - "subStateID": "q" - } - }, - "q49": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q1" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q5" - } - }, - "q50": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q2" - } - }, - "q51": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q3" - } - }, - "q52": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q4" - } - }, - "q53": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q5" - } - }, - "q54": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q6" - } - }, - "q55": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q7" - } - }, - "q56": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q8" - } - }, - "q56-49": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#6", - "subStateID": "q" - } - }, - "q57": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q1" - } - }, - "q58": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q2" - } - }, - "q59": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q3" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q6" - } - }, - "q60": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q4" - } - }, - "q61": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q5" - } - }, - "q62": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q6" - } - }, - "q63": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q7" - } - }, - "q64": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q8" - } - }, - "q64-57": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#7", - "subStateID": "q" - } - }, - "q65": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q1" - } - }, - "q66": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q2" - } - }, - "q67": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q3" - } - }, - "q68": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q4" - } - }, - "q69": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q5" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q7" - } - }, - "q70": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q6" - } - }, - "q71": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q7" - } - }, - "q72": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q8" - } - }, - "q72-65": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#8", - "subStateID": "q" - } - }, - "q73": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q1" - } - }, - "q74": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q2" - } - }, - "q75": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q3" - } - }, - "q76": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q4" - } - }, - "q77": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q5" - } - }, - "q78": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q6" - } - }, - "q79": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q7" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q8" - } - }, - "q8-1": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#0", - "subStateID": "q" - } - }, - "q80": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q8" - } - }, - "q80-73": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#9", - "subStateID": "q" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dff8#1", - "subStateID": "q1" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json deleted file mode 100644 index 3884fc0b..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json +++ /dev/null @@ -1,267 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "D", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "E", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "_Q", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 15.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 34.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "_rsLatch", - "name": "_rsLatch#0", - "pos": { - "x": 45.0, - "y": 7.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "E" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 35.0, - "y": 25.0 - }, - { - "x": 10.0, - "y": 25.0 - }, - { - "x": 10.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_rsLatch#0", - "pinName": "_S" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_rsLatch#0", - "pinName": "_R" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 40.0, - "y": 37.5 - }, - { - "x": 40.0, - "y": 22.5 - } - ] - }, - { - "pin1": { - "compName": "_rsLatch#0", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "_rsLatch#0", - "pinName": "_Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_Q" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "dlatch", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "delegating", - "params": { - "delegateTarget": "_rsLatch#0", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json deleted file mode 100644 index 87f53700..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json +++ /dev/null @@ -1,405 +0,0 @@ -{ - "width": 35.0, - "height": 50.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Q1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Q3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Q4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 14.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 14.0, - "y": 71.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 14.0, - "y": 96.5 - }, - "params": 1 - }, - { - "id": "dlatch", - "name": "dlatch#0", - "pos": { - "x": 30.0, - "y": 7.5 - } - }, - { - "id": "dlatch", - "name": "dlatch#1", - "pos": { - "x": 30.0, - "y": 32.5 - } - }, - { - "id": "dlatch", - "name": "dlatch#2", - "pos": { - "x": 30.0, - "y": 57.5 - } - }, - { - "id": "dlatch", - "name": "dlatch#3", - "pos": { - "x": 30.0, - "y": 82.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 15.0, - "y": 112.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#3", - "pinName": "E" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "dlatch#3", - "pinName": "D" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#0", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q1" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#1", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q2" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#2", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q3" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#3", - "pinName": "Q" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q4" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#2", - "pinName": "E" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#1", - "pinName": "E" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#0", - "pinName": "E" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 15.0, - "y": 22.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "dlatch#0", - "pinName": "D" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "dlatch#1", - "pinName": "D" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "dlatch#2", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "dlatch4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#1", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#2", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#3", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json deleted file mode 100644 index c871a951..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch8.json +++ /dev/null @@ -1,859 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D", - "logicWidth": 8, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "E", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q", - "logicWidth": 8, - "usage": "TRISTATE" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 40.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 160.0, - "y": 40.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 39.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 89.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 39.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 39.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 89.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 89.0, - "y": 44.0 - }, - "params": 1 - }, - { - "id": "dlatch", - "name": "dlatch#10", - "pos": { - "x": 95.0, - "y": 60.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#11", - "pos": { - "x": 45.0, - "y": 40.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#4", - "pos": { - "x": 45.0, - "y": 10.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#5", - "pos": { - "x": 95.0, - "y": 90.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#6", - "pos": { - "x": 95.0, - "y": 120.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#7", - "pos": { - "x": 45.0, - "y": 100.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#8", - "pos": { - "x": 45.0, - "y": 70.0 - } - }, - { - "id": "dlatch", - "name": "dlatch#9", - "pos": { - "x": 95.0, - "y": 30.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 40.0, - "y": 5.0 - }, - { - "x": 90.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "E" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#11", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 30.0, - "y": 45.0 - }, - { - "x": 30.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "dlatch#10", - "pinName": "D" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 25.0, - "y": 70.0 - }, - { - "x": 25.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#8", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 25.0, - "y": 75.0 - }, - { - "x": 25.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dlatch#5", - "pinName": "D" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 25.0, - "y": 90.0 - }, - { - "x": 25.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#7", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 25.0, - "y": 105.0 - }, - { - "x": 25.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dlatch#6", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 20.0, - "y": 110.0 - }, - { - "x": 20.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#11", - "pinName": "E" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#8", - "pinName": "E" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#7", - "pinName": "E" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 40.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#6", - "pinName": "E" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 90.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#5", - "pinName": "E" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "dlatch#10", - "pinName": "E" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#9", - "pinName": "E" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dlatch#4", - "pinName": "E" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "dlatch#4", - "pinName": "Q" - }, - "name": "unnamedWire#57", - "path": [ - { - "x": 155.0, - "y": 40.0 - }, - { - "x": 155.0, - "y": 25.0 - }, - { - "x": 85.0, - "y": 25.0 - }, - { - "x": 85.0, - "y": 15.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 150.0, - "y": 35.0 - }, - { - "x": 150.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "dlatch#11", - "pinName": "Q" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 145.0, - "y": 60.0 - }, - { - "x": 145.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "dlatch#10", - "pinName": "Q" - }, - "name": "unnamedWire#60", - "path": [ - { - "x": 140.0, - "y": 70.0 - }, - { - "x": 140.0, - "y": 65.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "dlatch#8", - "pinName": "Q" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 140.0, - "y": 80.0 - }, - { - "x": 140.0, - "y": 85.0 - }, - { - "x": 85.0, - "y": 85.0 - }, - { - "x": 85.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 140.0, - "y": 95.0 - }, - { - "x": 140.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "dlatch#7", - "pinName": "Q" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 140.0, - "y": 100.0 - }, - { - "x": 140.0, - "y": 115.0 - }, - { - "x": 85.0, - "y": 115.0 - }, - { - "x": 85.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#6", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 150.0, - "y": 125.0 - }, - { - "x": 150.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "dlatch#4", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 15.0 - }, - { - "x": 20.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "dlatch#9", - "pinName": "D" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 25.0, - "y": 50.0 - }, - { - "x": 25.0, - "y": 35.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D latch\n8 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q8", - "q7", - "q6", - "q5", - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#6", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#7", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#5", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#8", - "subStateID": "q" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#10", - "subStateID": "q" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#11", - "subStateID": "q" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#9", - "subStateID": "q" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#4", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json deleted file mode 100644 index d46c7843..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch80.json +++ /dev/null @@ -1,3563 +0,0 @@ -{ - "width": 25.0, - "height": 165.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "D", - "logicWidth": 80, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "E", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 25.0, - "y": 85.0 - }, - "name": "Q", - "logicWidth": 80, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 15.0, - "y": 30.0 - }, - "params": { - "logicWidth": 80, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 90.0, - "y": 750.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#10", - "pos": { - "x": 30.0, - "y": 670.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#11", - "pos": { - "x": 30.0, - "y": 750.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#12", - "pos": { - "x": 90.0, - "y": 510.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#13", - "pos": { - "x": 90.0, - "y": 590.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#14", - "pos": { - "x": 90.0, - "y": 110.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#15", - "pos": { - "x": 90.0, - "y": 430.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#16", - "pos": { - "x": 90.0, - "y": 190.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#17", - "pos": { - "x": 90.0, - "y": 350.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#18", - "pos": { - "x": 90.0, - "y": 270.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#19", - "pos": { - "x": 90.0, - "y": 670.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 30.0, - "y": 30.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#20", - "pos": { - "x": 90.0, - "y": 30.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#21", - "pos": { - "x": 105.0, - "y": 30.0 - }, - "params": { - "logicWidth": 80, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#3", - "pos": { - "x": 30.0, - "y": 110.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#4", - "pos": { - "x": 30.0, - "y": 190.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", - "pos": { - "x": 30.0, - "y": 270.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#6", - "pos": { - "x": 30.0, - "y": 350.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#7", - "pos": { - "x": 30.0, - "y": 430.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#8", - "pos": { - "x": 30.0, - "y": 510.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#9", - "pos": { - "x": 30.0, - "y": 590.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 44.0, - "y": 54.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 44.0, - "y": 134.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 44.0, - "y": 214.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 44.0, - "y": 294.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 44.0, - "y": 454.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 44.0, - "y": 374.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 44.0, - "y": 614.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 44.0, - "y": 534.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 44.0, - "y": 694.0 - }, - "params": 1 - }, - { - "id": "dlatch8", - "name": "dlatch8#0", - "pos": { - "x": 50.0, - "y": 770.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#1", - "pos": { - "x": 50.0, - "y": 690.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#2", - "pos": { - "x": 50.0, - "y": 610.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#3", - "pos": { - "x": 50.0, - "y": 530.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#4", - "pos": { - "x": 50.0, - "y": 450.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#5", - "pos": { - "x": 50.0, - "y": 370.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#6", - "pos": { - "x": 50.0, - "y": 290.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#7", - "pos": { - "x": 50.0, - "y": 210.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#8", - "pos": { - "x": 50.0, - "y": 130.0 - } - }, - { - "id": "dlatch8", - "name": "dlatch8#9", - "pos": { - "x": 50.0, - "y": 50.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O79" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O7" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O78" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O69" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O5" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O59" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O3" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O58" - }, - "name": "unnamedWire#101", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O57" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O1" - }, - "name": "unnamedWire#102", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O56" - }, - "name": "unnamedWire#103", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O55" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O7" - }, - "name": "unnamedWire#104", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O54" - }, - "name": "unnamedWire#105", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O53" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O5" - }, - "name": "unnamedWire#106", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O52" - }, - "name": "unnamedWire#107", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O51" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O3" - }, - "name": "unnamedWire#108", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O50" - }, - "name": "unnamedWire#109", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O68" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O49" - }, - "pin2": { - "compName": "Splitter#18", - "pinName": "O1" - }, - "name": "unnamedWire#110", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O48" - }, - "name": "unnamedWire#111", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O47" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O7" - }, - "name": "unnamedWire#112", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O46" - }, - "name": "unnamedWire#113", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O45" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O5" - }, - "name": "unnamedWire#114", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O44" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O43" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O3" - }, - "name": "unnamedWire#116", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O42" - }, - "name": "unnamedWire#117", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O41" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "O1" - }, - "name": "unnamedWire#118", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#17", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O40" - }, - "name": "unnamedWire#119", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O67" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O3" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O39" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O7" - }, - "name": "unnamedWire#120", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O38" - }, - "name": "unnamedWire#121", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O37" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O5" - }, - "name": "unnamedWire#122", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O36" - }, - "name": "unnamedWire#123", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O35" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O3" - }, - "name": "unnamedWire#124", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O34" - }, - "name": "unnamedWire#125", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O33" - }, - "pin2": { - "compName": "Splitter#15", - "pinName": "O1" - }, - "name": "unnamedWire#126", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O32" - }, - "name": "unnamedWire#127", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O31" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O7" - }, - "name": "unnamedWire#128", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O30" - }, - "name": "unnamedWire#129", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O66" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O29" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O5" - }, - "name": "unnamedWire#130", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O28" - }, - "name": "unnamedWire#131", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O27" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O3" - }, - "name": "unnamedWire#132", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O26" - }, - "name": "unnamedWire#133", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O25" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "O1" - }, - "name": "unnamedWire#134", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#12", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O24" - }, - "name": "unnamedWire#135", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O23" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O7" - }, - "name": "unnamedWire#136", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O22" - }, - "name": "unnamedWire#137", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O21" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O5" - }, - "name": "unnamedWire#138", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O20" - }, - "name": "unnamedWire#139", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O65" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O19" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O3" - }, - "name": "unnamedWire#140", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O18" - }, - "name": "unnamedWire#141", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O17" - }, - "pin2": { - "compName": "Splitter#13", - "pinName": "O1" - }, - "name": "unnamedWire#142", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O16" - }, - "name": "unnamedWire#143", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O7" - }, - "name": "unnamedWire#144", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O14" - }, - "name": "unnamedWire#145", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O5" - }, - "name": "unnamedWire#146", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O12" - }, - "name": "unnamedWire#147", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O3" - }, - "name": "unnamedWire#148", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O10" - }, - "name": "unnamedWire#149", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O64" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "O1" - }, - "name": "unnamedWire#150", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#19", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O8" - }, - "name": "unnamedWire#151", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "name": "unnamedWire#152", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O6" - }, - "name": "unnamedWire#153", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "name": "unnamedWire#154", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O4" - }, - "name": "unnamedWire#155", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "name": "unnamedWire#156", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O2" - }, - "name": "unnamedWire#157", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#158", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O0" - }, - "name": "unnamedWire#159", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O63" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O7" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#9", - "pinName": "D" - }, - "name": "unnamedWire#160", - "path": [] - }, - { - "pin1": { - "compName": "dlatch8#9", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "I" - }, - "name": "unnamedWire#161", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#8", - "pinName": "D" - }, - "name": "unnamedWire#162", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#7", - "pinName": "D" - }, - "name": "unnamedWire#163", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#6", - "pinName": "D" - }, - "name": "unnamedWire#164", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#5", - "pinName": "D" - }, - "name": "unnamedWire#165", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#4", - "pinName": "D" - }, - "name": "unnamedWire#166", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#3", - "pinName": "D" - }, - "name": "unnamedWire#167", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#2", - "pinName": "D" - }, - "name": "unnamedWire#168", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#1", - "pinName": "D" - }, - "name": "unnamedWire#169", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O62" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#0", - "pinName": "D" - }, - "name": "unnamedWire#170", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#0", - "pinName": "Q" - }, - "name": "unnamedWire#171", - "path": [] - }, - { - "pin1": { - "compName": "dlatch8#1", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#19", - "pinName": "I" - }, - "name": "unnamedWire#172", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#13", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#2", - "pinName": "Q" - }, - "name": "unnamedWire#173", - "path": [] - }, - { - "pin1": { - "compName": "dlatch8#3", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#12", - "pinName": "I" - }, - "name": "unnamedWire#174", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#15", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#4", - "pinName": "Q" - }, - "name": "unnamedWire#175", - "path": [] - }, - { - "pin1": { - "compName": "dlatch8#5", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#17", - "pinName": "I" - }, - "name": "unnamedWire#176", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#18", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#6", - "pinName": "Q" - }, - "name": "unnamedWire#177", - "path": [] - }, - { - "pin1": { - "compName": "dlatch8#7", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "I" - }, - "name": "unnamedWire#178", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "I" - }, - "pin2": { - "compName": "dlatch8#8", - "pinName": "Q" - }, - "name": "unnamedWire#179", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O61" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O5" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#180", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "I" - }, - "name": "unnamedWire#181", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "E" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#182", - "path": [ - { - "x": 45.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#9", - "pinName": "E" - }, - "name": "unnamedWire#183", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#8", - "pinName": "E" - }, - "name": "unnamedWire#184", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#185", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#186", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#7", - "pinName": "E" - }, - "name": "unnamedWire#187", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#188", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#6", - "pinName": "E" - }, - "name": "unnamedWire#189", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O60" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#190", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#5", - "pinName": "E" - }, - "name": "unnamedWire#191", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#192", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#4", - "pinName": "E" - }, - "name": "unnamedWire#193", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#194", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#3", - "pinName": "E" - }, - "name": "unnamedWire#195", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#196", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#2", - "pinName": "E" - }, - "name": "unnamedWire#197", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#198", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#1", - "pinName": "E" - }, - "name": "unnamedWire#199", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O77" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O5" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O59" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O3" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dlatch8#0", - "pinName": "E" - }, - "name": "unnamedWire#200", - "path": [ - { - "x": 45.0, - "y": 775.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O58" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O57" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O56" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O55" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O7" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O54" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O53" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O5" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O52" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O51" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O3" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O50" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O76" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O49" - }, - "pin2": { - "compName": "Splitter#5", - "pinName": "O1" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#5", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O48" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O47" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O7" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O46" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O45" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O5" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O44" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O43" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O3" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O42" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O41" - }, - "pin2": { - "compName": "Splitter#6", - "pinName": "O1" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O40" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O75" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O39" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O7" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O38" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O37" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O5" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O36" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O35" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O3" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O34" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O33" - }, - "pin2": { - "compName": "Splitter#7", - "pinName": "O1" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#7", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O32" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O31" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O7" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O30" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O74" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O29" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O5" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O28" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O27" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O3" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O26" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O25" - }, - "pin2": { - "compName": "Splitter#8", - "pinName": "O1" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#8", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O24" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O23" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O7" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O22" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O21" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O5" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O20" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O73" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O19" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O3" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O18" - }, - "name": "unnamedWire#61", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O17" - }, - "pin2": { - "compName": "Splitter#9", - "pinName": "O1" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#9", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O16" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O15" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O7" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O14" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O5" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "name": "unnamedWire#67", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O3" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "name": "unnamedWire#69", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O72" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "pin2": { - "compName": "Splitter#10", - "pinName": "O1" - }, - "name": "unnamedWire#70", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#10", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "name": "unnamedWire#71", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O7" - }, - "name": "unnamedWire#72", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "name": "unnamedWire#73", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O5" - }, - "name": "unnamedWire#74", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "name": "unnamedWire#75", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O3" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "Splitter#11", - "pinName": "O1" - }, - "name": "unnamedWire#78", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#11", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#79", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O71" - }, - "pin2": { - "compName": "Splitter#3", - "pinName": "O7" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O79" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O7" - }, - "name": "unnamedWire#80", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O78" - }, - "name": "unnamedWire#81", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O77" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O5" - }, - "name": "unnamedWire#82", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O76" - }, - "name": "unnamedWire#83", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O75" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O3" - }, - "name": "unnamedWire#84", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O74" - }, - "name": "unnamedWire#85", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O73" - }, - "pin2": { - "compName": "Splitter#20", - "pinName": "O1" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#20", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O72" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O71" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O7" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O70" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#3", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O70" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O69" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O5" - }, - "name": "unnamedWire#90", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O68" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O67" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O3" - }, - "name": "unnamedWire#92", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O2" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O66" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O65" - }, - "pin2": { - "compName": "Splitter#14", - "pinName": "O1" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#14", - "pinName": "O0" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O64" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O63" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O7" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O6" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O62" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#21", - "pinName": "O61" - }, - "pin2": { - "compName": "Splitter#16", - "pinName": "O5" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#16", - "pinName": "O4" - }, - "pin2": { - "compName": "Splitter#21", - "pinName": "O60" - }, - "name": "unnamedWire#99", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D latch\n80 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 30.0, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q80-73", - "q72-65", - "q64-57", - "q56-49", - "q48-41", - "q40-33", - "q32-25", - "q24-17", - "q16-9", - "q8-1" - ], - "vectorPartLengthes": [ - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q1" - } - }, - "q10": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q2" - } - }, - "q11": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q3" - } - }, - "q12": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q4" - } - }, - "q13": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q5" - } - }, - "q14": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q6" - } - }, - "q15": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q7" - } - }, - "q16": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q8" - } - }, - "q16-9": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q" - } - }, - "q17": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q1" - } - }, - "q18": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q2" - } - }, - "q19": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q3" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q2" - } - }, - "q20": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q4" - } - }, - "q21": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q5" - } - }, - "q22": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q6" - } - }, - "q23": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q7" - } - }, - "q24": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q8" - } - }, - "q24-17": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#2", - "subStateID": "q" - } - }, - "q25": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q1" - } - }, - "q26": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q2" - } - }, - "q27": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q3" - } - }, - "q28": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q4" - } - }, - "q29": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q5" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q3" - } - }, - "q30": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q6" - } - }, - "q31": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q7" - } - }, - "q32": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q8" - } - }, - "q32-25": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#3", - "subStateID": "q" - } - }, - "q33": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q1" - } - }, - "q34": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q2" - } - }, - "q35": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q3" - } - }, - "q36": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q4" - } - }, - "q37": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q5" - } - }, - "q38": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q6" - } - }, - "q39": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q7" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q4" - } - }, - "q40": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q8" - } - }, - "q40-33": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#4", - "subStateID": "q" - } - }, - "q41": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q1" - } - }, - "q42": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q2" - } - }, - "q43": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q3" - } - }, - "q44": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q4" - } - }, - "q45": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q5" - } - }, - "q46": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q6" - } - }, - "q47": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q7" - } - }, - "q48": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q8" - } - }, - "q48-41": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#5", - "subStateID": "q" - } - }, - "q49": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q1" - } - }, - "q5": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q5" - } - }, - "q50": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q2" - } - }, - "q51": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q3" - } - }, - "q52": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q4" - } - }, - "q53": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q5" - } - }, - "q54": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q6" - } - }, - "q55": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q7" - } - }, - "q56": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q8" - } - }, - "q56-49": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#6", - "subStateID": "q" - } - }, - "q57": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q1" - } - }, - "q58": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q2" - } - }, - "q59": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q3" - } - }, - "q6": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q6" - } - }, - "q60": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q4" - } - }, - "q61": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q5" - } - }, - "q62": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q6" - } - }, - "q63": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q7" - } - }, - "q64": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q8" - } - }, - "q64-57": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#7", - "subStateID": "q" - } - }, - "q65": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q1" - } - }, - "q66": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q2" - } - }, - "q67": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q3" - } - }, - "q68": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q4" - } - }, - "q69": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q5" - } - }, - "q7": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q7" - } - }, - "q70": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q6" - } - }, - "q71": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q7" - } - }, - "q72": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q8" - } - }, - "q72-65": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#8", - "subStateID": "q" - } - }, - "q73": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q1" - } - }, - "q74": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q2" - } - }, - "q75": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q3" - } - }, - "q76": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q4" - } - }, - "q77": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q5" - } - }, - "q78": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q6" - } - }, - "q79": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q7" - } - }, - "q8": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q8" - } - }, - "q8-1": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#0", - "subStateID": "q" - } - }, - "q80": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q8" - } - }, - "q80-73": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#9", - "subStateID": "q" - } - }, - "q9": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch8#1", - "subStateID": "q1" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json deleted file mode 100644 index 4ba4b195..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Z", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 57.5, - "y": 40.0 - }, - "params": 1 - }, - { - "id": "halfadder", - "name": "halfadder#0", - "pos": { - "x": 5.0, - "y": 40.0 - } - }, - { - "id": "halfadder", - "name": "halfadder#1", - "pos": { - "x": 45.0, - "y": 7.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "pin2": { - "compName": "halfadder#1", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "halfadder#0", - "pinName": "A" - }, - "name": "unnamedWire#1" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "halfadder#0", - "pinName": "B" - }, - "name": "unnamedWire#2" - }, - { - "pin1": { - "compName": "halfadder#0", - "pinName": "Y" - }, - "pin2": { - "compName": "halfadder#1", - "pinName": "B" - }, - "name": "unnamedWire#3" - }, - { - "pin1": { - "compName": "halfadder#0", - "pinName": "_Z" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "halfadder#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "halfadder#1", - "pinName": "_Z" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 82.5, - "y": 22.5 - }, - { - "x": 82.5, - "y": 35.0 - }, - { - "x": 52.5, - "y": 35.0 - }, - { - "x": 52.5, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Z" - }, - "name": "unnamedWire#7" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "fulladder", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json deleted file mode 100644 index d56f83e0..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json +++ /dev/null @@ -1,337 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "_Z", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 40.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 40.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 65.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 4.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 34.0, - "y": 24.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 5.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 62.5, - "y": 12.5 - }, - { - "x": 62.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 62.5, - "y": 37.5 - }, - { - "x": 62.5, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 5.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 5.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_Z" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 80.0, - "y": 25.0 - }, - { - "x": 80.0, - "y": 37.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 35.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 35.0, - "y": 32.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "halfadder", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json deleted file mode 100644 index 3997209b..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 7.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 35.0, - "y": 22.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 35.0, - "y": 47.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 60.0, - "y": 30.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 4.0, - "y": 21.5 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#10" - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#4" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 5.0, - "y": 52.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#8" - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "mux1", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json deleted file mode 100644 index 9f1da98e..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json +++ /dev/null @@ -1,1845 +0,0 @@ -{ - "width": 50.0, - "height": 80.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "I0", - "logicWidth": 12, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 60.0 - }, - "name": "I1", - "logicWidth": 12, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 50.0, - "y": 30.0 - }, - "name": "Y", - "logicWidth": 12, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 55.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 45.0 - }, - "params": { - "logicWidth": 12, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 5.0, - "y": 245.0 - }, - "params": { - "logicWidth": 12, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 235.0, - "y": 95.0 - }, - "params": { - "logicWidth": 12, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 139.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 144.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 89.0, - "y": 4.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 84.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 49.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 49.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 84.0, - "y": 269.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 89.0, - "y": 279.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 84.0, - "y": 209.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 89.0, - "y": 219.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 89.0, - "y": 159.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 84.0, - "y": 149.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 144.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 84.0, - "y": 89.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 89.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 84.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 89.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 139.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 139.0, - "y": 169.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 144.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 144.0, - "y": 239.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 139.0, - "y": 229.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 144.0, - "y": 299.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 139.0, - "y": 289.0 - }, - "params": 1 - }, - { - "id": "sel1", - "name": "sel1#0", - "pos": { - "x": 150.0, - "y": 45.0 - } - }, - { - "id": "sel1", - "name": "sel1#1", - "pos": { - "x": 95.0, - "y": 85.0 - } - }, - { - "id": "sel1", - "name": "sel1#10", - "pos": { - "x": 95.0, - "y": 265.0 - } - }, - { - "id": "sel1", - "name": "sel1#11", - "pos": { - "x": 150.0, - "y": 345.0 - } - }, - { - "id": "sel1", - "name": "sel1#2", - "pos": { - "x": 150.0, - "y": 105.0 - } - }, - { - "id": "sel1", - "name": "sel1#3", - "pos": { - "x": 95.0, - "y": 25.0 - } - }, - { - "id": "sel1", - "name": "sel1#4", - "pos": { - "x": 95.0, - "y": 325.0 - } - }, - { - "id": "sel1", - "name": "sel1#5", - "pos": { - "x": 150.0, - "y": 165.0 - } - }, - { - "id": "sel1", - "name": "sel1#6", - "pos": { - "x": 95.0, - "y": 145.0 - } - }, - { - "id": "sel1", - "name": "sel1#7", - "pos": { - "x": 95.0, - "y": 205.0 - } - }, - { - "id": "sel1", - "name": "sel1#8", - "pos": { - "x": 150.0, - "y": 285.0 - } - }, - { - "id": "sel1", - "name": "sel1#9", - "pos": { - "x": 150.0, - "y": 225.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "sel1#3", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O11" - }, - "name": "unnamedWire#103", - "path": [ - { - "x": 210.0, - "y": 30.0 - }, - { - "x": 210.0, - "y": 95.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O10" - }, - "name": "unnamedWire#104", - "path": [ - { - "x": 205.0, - "y": 50.0 - }, - { - "x": 205.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "Y" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 200.0, - "y": 115.0 - }, - { - "x": 200.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#2", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O8" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 195.0, - "y": 110.0 - }, - { - "x": 195.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "Y" - }, - "name": "unnamedWire#107", - "path": [ - { - "x": 195.0, - "y": 135.0 - }, - { - "x": 195.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#5", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O6" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 200.0, - "y": 170.0 - }, - { - "x": 200.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "Y" - }, - "name": "unnamedWire#109", - "path": [ - { - "x": 205.0, - "y": 155.0 - }, - { - "x": 205.0, - "y": 210.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S2" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O4" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 210.0, - "y": 230.0 - }, - { - "x": 210.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "Y" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 215.0, - "y": 175.0 - }, - { - "x": 215.0, - "y": 270.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#8", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 220.0, - "y": 290.0 - }, - { - "x": 220.0, - "y": 185.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "Y" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 225.0, - "y": 195.0 - }, - { - "x": 225.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#11", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 230.0, - "y": 350.0 - }, - { - "x": 230.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 50.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#10", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "S2" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S1" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 140.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#8", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "S1" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 140.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "S1" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "sel1#5", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "S1" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "sel1#2", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "sel1#2", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "sel1#0", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "S1" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 145.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "S1" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S2" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 145.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "S1" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 85.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "S2" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 90.0, - "y": 340.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "S2" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "S1" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "I1" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 75.0, - "y": 45.0 - }, - { - "x": 75.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I1" - }, - "name": "unnamedWire#65", - "path": [ - { - "x": 70.0, - "y": 55.0 - }, - { - "x": 70.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I1" - }, - "name": "unnamedWire#66", - "path": [ - { - "x": 65.0, - "y": 65.0 - }, - { - "x": 65.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "I1" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 60.0, - "y": 75.0 - }, - { - "x": 60.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I1" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 55.0, - "y": 85.0 - }, - { - "x": 55.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I1" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 50.0, - "y": 95.0 - }, - { - "x": 50.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#1", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I1" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 45.0, - "y": 105.0 - }, - { - "x": 45.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I1" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 40.0, - "y": 115.0 - }, - { - "x": 40.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I1" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 35.0, - "y": 125.0 - }, - { - "x": 35.0, - "y": 290.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I1" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 30.0, - "y": 135.0 - }, - { - "x": 30.0, - "y": 310.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I1" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 25.0, - "y": 145.0 - }, - { - "x": 25.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I1" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 20.0, - "y": 155.0 - }, - { - "x": 20.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "S1" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O11" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "I2" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 75.0, - "y": 245.0 - }, - { - "x": 75.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O10" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I2" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 70.0, - "y": 255.0 - }, - { - "x": 70.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I2" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 65.0, - "y": 265.0 - }, - { - "x": 65.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O8" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "I2" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 60.0, - "y": 275.0 - }, - { - "x": 60.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I2" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 55.0, - "y": 285.0 - }, - { - "x": 55.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I2" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 50.0, - "y": 295.0 - }, - { - "x": 50.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I2" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 45.0, - "y": 305.0 - }, - { - "x": 45.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I2" - }, - "name": "unnamedWire#89", - "path": [ - { - "x": 40.0, - "y": 315.0 - }, - { - "x": 40.0, - "y": 260.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#6", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I2" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 35.0, - "y": 325.0 - }, - { - "x": 35.0, - "y": 300.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I2" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 30.0, - "y": 335.0 - }, - { - "x": 30.0, - "y": 320.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I2" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 45.0, - "y": 345.0 - }, - { - "x": 45.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I2" - }, - "name": "unnamedWire#93", - "path": [ - { - "x": 40.0, - "y": 355.0 - }, - { - "x": 40.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#98", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "MUX\n12 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 23.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json deleted file mode 100644 index e29bbbf0..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json +++ /dev/null @@ -1,2384 +0,0 @@ -{ - "width": 55.0, - "height": 110.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I0", - "logicWidth": 16, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 90.0 - }, - "name": "I1", - "logicWidth": 16, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 55.0, - "y": 50.0 - }, - "name": "Y", - "logicWidth": 16, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 70.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 50.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 5.0, - "y": 375.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 260.0, - "y": 175.0 - }, - "params": { - "logicWidth": 16, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 164.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 169.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 169.0, - "y": 359.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 164.0, - "y": 349.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 169.0, - "y": 419.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 164.0, - "y": 409.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 109.0, - "y": 4.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 104.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 64.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 64.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 104.0, - "y": 389.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 109.0, - "y": 399.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 164.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 104.0, - "y": 329.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 109.0, - "y": 339.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 109.0, - "y": 279.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 104.0, - "y": 269.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 104.0, - "y": 209.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 109.0, - "y": 219.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 104.0, - "y": 149.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 109.0, - "y": 159.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 109.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#29", - "pos": { - "x": 104.0, - "y": 89.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#30", - "pos": { - "x": 104.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#31", - "pos": { - "x": 109.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 164.0, - "y": 169.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 169.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 169.0, - "y": 239.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 164.0, - "y": 229.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 164.0, - "y": 289.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 169.0, - "y": 299.0 - }, - "params": 1 - }, - { - "id": "sel1", - "name": "sel1#0", - "pos": { - "x": 115.0, - "y": 25.0 - } - }, - { - "id": "sel1", - "name": "sel1#1", - "pos": { - "x": 175.0, - "y": 45.0 - } - }, - { - "id": "sel1", - "name": "sel1#10", - "pos": { - "x": 115.0, - "y": 265.0 - } - }, - { - "id": "sel1", - "name": "sel1#11", - "pos": { - "x": 115.0, - "y": 325.0 - } - }, - { - "id": "sel1", - "name": "sel1#12", - "pos": { - "x": 175.0, - "y": 405.0 - } - }, - { - "id": "sel1", - "name": "sel1#13", - "pos": { - "x": 175.0, - "y": 345.0 - } - }, - { - "id": "sel1", - "name": "sel1#14", - "pos": { - "x": 115.0, - "y": 385.0 - } - }, - { - "id": "sel1", - "name": "sel1#15", - "pos": { - "x": 175.0, - "y": 465.0 - } - }, - { - "id": "sel1", - "name": "sel1#2", - "pos": { - "x": 115.0, - "y": 85.0 - } - }, - { - "id": "sel1", - "name": "sel1#3", - "pos": { - "x": 175.0, - "y": 105.0 - } - }, - { - "id": "sel1", - "name": "sel1#4", - "pos": { - "x": 175.0, - "y": 165.0 - } - }, - { - "id": "sel1", - "name": "sel1#5", - "pos": { - "x": 115.0, - "y": 205.0 - } - }, - { - "id": "sel1", - "name": "sel1#6", - "pos": { - "x": 175.0, - "y": 225.0 - } - }, - { - "id": "sel1", - "name": "sel1#7", - "pos": { - "x": 115.0, - "y": 145.0 - } - }, - { - "id": "sel1", - "name": "sel1#8", - "pos": { - "x": 115.0, - "y": 445.0 - } - }, - { - "id": "sel1", - "name": "sel1#9", - "pos": { - "x": 175.0, - "y": 285.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "S1" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "S2" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O14" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "Y" - }, - "name": "unnamedWire#100", - "path": [ - { - "x": 250.0, - "y": 185.0 - }, - { - "x": 250.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#2", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O13" - }, - "name": "unnamedWire#101", - "path": [ - { - "x": 245.0, - "y": 90.0 - }, - { - "x": 245.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O12" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "Y" - }, - "name": "unnamedWire#102", - "path": [ - { - "x": 240.0, - "y": 205.0 - }, - { - "x": 240.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#7", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O11" - }, - "name": "unnamedWire#103", - "path": [ - { - "x": 235.0, - "y": 150.0 - }, - { - "x": 235.0, - "y": 215.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#4", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O10" - }, - "name": "unnamedWire#104", - "path": [ - { - "x": 230.0, - "y": 170.0 - }, - { - "x": 230.0, - "y": 225.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "Y" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 225.0, - "y": 235.0 - }, - { - "x": 225.0, - "y": 210.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#6", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O8" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 220.0, - "y": 230.0 - }, - { - "x": 220.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "Y" - }, - "name": "unnamedWire#107", - "path": [ - { - "x": 220.0, - "y": 255.0 - }, - { - "x": 220.0, - "y": 270.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O6" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 225.0, - "y": 290.0 - }, - { - "x": 225.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "Y" - }, - "name": "unnamedWire#109", - "path": [ - { - "x": 230.0, - "y": 275.0 - }, - { - "x": 230.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S2" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "sel1#13", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O4" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 235.0, - "y": 350.0 - }, - { - "x": 235.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#14", - "pinName": "Y" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 240.0, - "y": 295.0 - }, - { - "x": 240.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#12", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 245.0, - "y": 410.0 - }, - { - "x": 245.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "Y" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 250.0, - "y": 315.0 - }, - { - "x": 250.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#15", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 255.0, - "y": 470.0 - }, - { - "x": 255.0, - "y": 325.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 65.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#14", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "sel1#14", - "pinName": "S2" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "sel1#15", - "pinName": "S1" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 165.0, - "y": 470.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "sel1#12", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "sel1#12", - "pinName": "S1" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "S1" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "sel1#13", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "sel1#13", - "pinName": "S1" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "S1" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "sel1#6", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "sel1#6", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "sel1#4", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "S1" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "sel1#3", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "S1" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "S2" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "sel1#1", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "S1" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S1" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "sel1#15", - "pinName": "S2" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 170.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "S1" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 105.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "S2" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 110.0, - "y": 460.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S2" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#58", - "path": [ - { - "x": 165.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#59", - "path": [ - { - "x": 170.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "S1" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O15" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I1" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O14" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I1" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 90.0, - "y": 60.0 - }, - { - "x": 90.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O13" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "I1" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 85.0, - "y": 70.0 - }, - { - "x": 85.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O12" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "I1" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 80.0, - "y": 80.0 - }, - { - "x": 80.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O11" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I1" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 75.0, - "y": 90.0 - }, - { - "x": 75.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O10" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I1" - }, - "name": "unnamedWire#65", - "path": [ - { - "x": 70.0, - "y": 100.0 - }, - { - "x": 70.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I1" - }, - "name": "unnamedWire#66", - "path": [ - { - "x": 65.0, - "y": 110.0 - }, - { - "x": 65.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O8" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I1" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 60.0, - "y": 120.0 - }, - { - "x": 60.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I1" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 55.0, - "y": 130.0 - }, - { - "x": 55.0, - "y": 290.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I1" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 50.0, - "y": 140.0 - }, - { - "x": 50.0, - "y": 310.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#5", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I1" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 45.0, - "y": 150.0 - }, - { - "x": 45.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#13", - "pinName": "I1" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 40.0, - "y": 160.0 - }, - { - "x": 40.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#14", - "pinName": "I1" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 35.0, - "y": 170.0 - }, - { - "x": 35.0, - "y": 410.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#12", - "pinName": "I1" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 30.0, - "y": 180.0 - }, - { - "x": 30.0, - "y": 430.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I1" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 25.0, - "y": 190.0 - }, - { - "x": 25.0, - "y": 470.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#15", - "pinName": "I1" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 20.0, - "y": 200.0 - }, - { - "x": 20.0, - "y": 490.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O15" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I2" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 95.0, - "y": 375.0 - }, - { - "x": 95.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O14" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I2" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 90.0, - "y": 385.0 - }, - { - "x": 90.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "S1" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O13" - }, - "pin2": { - "compName": "sel1#2", - "pinName": "I2" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 85.0, - "y": 395.0 - }, - { - "x": 85.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O12" - }, - "pin2": { - "compName": "sel1#3", - "pinName": "I2" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 80.0, - "y": 405.0 - }, - { - "x": 80.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O11" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I2" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 75.0, - "y": 415.0 - }, - { - "x": 75.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O10" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I2" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 70.0, - "y": 425.0 - }, - { - "x": 70.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O9" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I2" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 65.0, - "y": 435.0 - }, - { - "x": 65.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O8" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I2" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 60.0, - "y": 445.0 - }, - { - "x": 60.0, - "y": 260.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I2" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 55.0, - "y": 455.0 - }, - { - "x": 55.0, - "y": 300.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I2" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 50.0, - "y": 465.0 - }, - { - "x": 50.0, - "y": 320.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I2" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 45.0, - "y": 475.0 - }, - { - "x": 45.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#13", - "pinName": "I2" - }, - "name": "unnamedWire#89", - "path": [ - { - "x": 40.0, - "y": 485.0 - }, - { - "x": 40.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#10", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#14", - "pinName": "I2" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 35.0, - "y": 495.0 - }, - { - "x": 35.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#12", - "pinName": "I2" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 30.0, - "y": 505.0 - }, - { - "x": 30.0, - "y": 440.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I2" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 25.0, - "y": 515.0 - }, - { - "x": 25.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#15", - "pinName": "I2" - }, - "name": "unnamedWire#93", - "path": [ - { - "x": 20.0, - "y": 525.0 - }, - { - "x": 20.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "sel1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O15" - }, - "name": "unnamedWire#99", - "path": [ - { - "x": 255.0, - "y": 30.0 - }, - { - "x": 255.0, - "y": 175.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "MUX\n16 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 23.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json deleted file mode 100644 index b5b16b89..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "width": 35.0, - "height": 90.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I0_1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I0_2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "I0_3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "I0_4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "I1_1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "I1_2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "I1_3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "I1_4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 24.0, - "y": 81.5 - }, - "params": 1 - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 30.0, - "y": 7.5 - } - }, - { - "id": "mux1", - "name": "mux1#1", - "pos": { - "x": 30.0, - "y": 42.5 - } - }, - { - "id": "mux1", - "name": "mux1#2", - "pos": { - "x": 30.0, - "y": 77.5 - } - }, - { - "id": "mux1", - "name": "mux1#3", - "pos": { - "x": 30.0, - "y": 112.5 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "S0" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "mux1#2", - "pinName": "S0" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0_3" - }, - "pin2": { - "compName": "mux1#2", - "pinName": "I0" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 5.0, - "y": 87.5 - }, - { - "x": 5.0, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1_3" - }, - "pin2": { - "compName": "mux1#2", - "pinName": "I1" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 20.0, - "y": 187.5 - }, - { - "x": 20.0, - "y": 102.5 - } - ] - }, - { - "pin1": { - "compName": "mux1#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#14" - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "mux1#3", - "pinName": "S0" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 25.0, - "y": 117.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0_4" - }, - "pin2": { - "compName": "mux1#3", - "pinName": "I0" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 5.0, - "y": 112.5 - }, - { - "x": 5.0, - "y": 127.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1_4" - }, - "pin2": { - "compName": "mux1#3", - "pinName": "I1" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 25.0, - "y": 212.5 - }, - { - "x": 25.0, - "y": 137.5 - } - ] - }, - { - "pin1": { - "compName": "mux1#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#18" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0_1" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 37.5 - }, - { - "x": 5.0, - "y": 22.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1_1" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 137.5 - }, - { - "x": 10.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "mux1#1", - "pinName": "S0" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0_2" - }, - "pin2": { - "compName": "mux1#1", - "pinName": "I0" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 5.0, - "y": 62.5 - }, - { - "x": 5.0, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1_2" - }, - "pin2": { - "compName": "mux1#1", - "pinName": "I1" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 15.0, - "y": 162.5 - }, - { - "x": 15.0, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "mux1#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "mux1_4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json deleted file mode 100644 index 4a34c7c8..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_8.json +++ /dev/null @@ -1,1297 +0,0 @@ -{ - "width": 40.0, - "height": 55.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I0", - "logicWidth": 8, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 40.0 - }, - "name": "I1", - "logicWidth": 8, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 40.0, - "y": 25.0 - }, - "name": "Y", - "logicWidth": 8, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 15.0, - "y": 10.0 - }, - "params": 1 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 5.0, - "y": 40.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 5.0, - "y": 165.0 - }, - "params": { - "logicWidth": 8, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": 185.0, - "y": 90.0 - }, - "params": { - "logicWidth": 8, - "orientation": "LEFT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 69.0, - "y": 4.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 64.0, - "y": 19.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 9.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 9.0, - "y": 14.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 64.0, - "y": 149.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 69.0, - "y": 159.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 64.0, - "y": 89.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 69.0, - "y": 99.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 69.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 64.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 114.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 119.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 119.0, - "y": 119.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 114.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 119.0, - "y": 179.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 114.0, - "y": 169.0 - }, - "params": 1 - }, - { - "id": "sel1", - "name": "sel1#10", - "pos": { - "x": 75.0, - "y": 145.0 - } - }, - { - "id": "sel1", - "name": "sel1#11", - "pos": { - "x": 125.0, - "y": 225.0 - } - }, - { - "id": "sel1", - "name": "sel1#4", - "pos": { - "x": 75.0, - "y": 205.0 - } - }, - { - "id": "sel1", - "name": "sel1#5", - "pos": { - "x": 125.0, - "y": 45.0 - } - }, - { - "id": "sel1", - "name": "sel1#6", - "pos": { - "x": 75.0, - "y": 25.0 - } - }, - { - "id": "sel1", - "name": "sel1#7", - "pos": { - "x": 75.0, - "y": 85.0 - } - }, - { - "id": "sel1", - "name": "sel1#8", - "pos": { - "x": 125.0, - "y": 165.0 - } - }, - { - "id": "sel1", - "name": "sel1#9", - "pos": { - "x": 125.0, - "y": 105.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "Y" - }, - "name": "unnamedWire#107", - "path": [ - { - "x": 180.0, - "y": 90.0 - }, - { - "x": 180.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#5", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O6" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 175.0, - "y": 50.0 - }, - { - "x": 175.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "Y" - }, - "name": "unnamedWire#109", - "path": [ - { - "x": 170.0, - "y": 110.0 - }, - { - "x": 170.0, - "y": 90.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "S2" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O4" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 165.0, - "y": 110.0 - }, - { - "x": 165.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "Y" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 165.0, - "y": 130.0 - }, - { - "x": 165.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#8", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O2" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 170.0, - "y": 170.0 - }, - { - "x": 170.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "Y" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 175.0, - "y": 150.0 - }, - { - "x": 175.0, - "y": 210.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#11", - "pinName": "Y" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 180.0, - "y": 230.0 - }, - { - "x": 180.0, - "y": 160.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "I" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#115", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 10.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#10", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "S2" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S1" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 115.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#8", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "S1" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "sel1#9", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "S1" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "sel1#5", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "S1" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 120.0, - "y": 5.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 115.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "S2" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 120.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "S1" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 65.0, - "y": 210.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "S2" - }, - "name": "unnamedWire#49", - "path": [ - { - "x": 70.0, - "y": 220.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I1" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 55.0, - "y": 40.0 - }, - { - "x": 55.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I1" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 50.0, - "y": 50.0 - }, - { - "x": 50.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I1" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 45.0, - "y": 60.0 - }, - { - "x": 45.0, - "y": 110.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I1" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 40.0, - "y": 70.0 - }, - { - "x": 40.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I1" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 35.0, - "y": 80.0 - }, - { - "x": 35.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I1" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 30.0, - "y": 90.0 - }, - { - "x": 30.0, - "y": 190.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I1" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 25.0, - "y": 100.0 - }, - { - "x": 25.0, - "y": 230.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I1" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 20.0, - "y": 110.0 - }, - { - "x": 20.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#76", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#77", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "S1" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O7" - }, - "pin2": { - "compName": "sel1#6", - "pinName": "I2" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 55.0, - "y": 165.0 - }, - { - "x": 55.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O6" - }, - "pin2": { - "compName": "sel1#5", - "pinName": "I2" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 50.0, - "y": 175.0 - }, - { - "x": 50.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O5" - }, - "pin2": { - "compName": "sel1#7", - "pinName": "I2" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 45.0, - "y": 185.0 - }, - { - "x": 45.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O4" - }, - "pin2": { - "compName": "sel1#9", - "pinName": "I2" - }, - "name": "unnamedWire#89", - "path": [ - { - "x": 40.0, - "y": 195.0 - }, - { - "x": 40.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#6", - "pinName": "S2" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "sel1#10", - "pinName": "I2" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 35.0, - "y": 205.0 - }, - { - "x": 35.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "sel1#8", - "pinName": "I2" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 30.0, - "y": 215.0 - }, - { - "x": 30.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "pin2": { - "compName": "sel1#4", - "pinName": "I2" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 45.0, - "y": 225.0 - }, - { - "x": 45.0, - "y": 240.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "sel1#11", - "pinName": "I2" - }, - "name": "unnamedWire#93", - "path": [ - { - "x": 40.0, - "y": 235.0 - }, - { - "x": 40.0, - "y": 260.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#98", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "MUX\n8 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 23.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json deleted file mode 100644 index 91d1220e..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json +++ /dev/null @@ -1,434 +0,0 @@ -{ - "width": 70.0, - "height": 70.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 30.0 - }, - "name": "I00", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 40.0 - }, - "name": "I01", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "I10", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 60.0 - }, - "name": "I11", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "S0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "S1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 70.0, - "y": 10.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 30.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 54.0, - "y": 39.0 - }, - "params": 1 - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "sel1", - "name": "sel1#0", - "pos": { - "x": 60.0, - "y": 35.0 - } - }, - { - "id": "sel1", - "name": "sel1#1", - "pos": { - "x": 60.0, - "y": 100.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "S0" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "S2" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "sel1#0", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 55.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "S2" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 25.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "S1" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 55.0, - "y": 105.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 25.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I00" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I1" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 35.0, - "y": 75.0 - }, - { - "x": 35.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I01" - }, - "pin2": { - "compName": "sel1#0", - "pinName": "I2" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 40.0, - "y": 100.0 - }, - { - "x": 40.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I10" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I1" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I11" - }, - "pin2": { - "compName": "sel1#1", - "pinName": "I2" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 20.0, - "y": 150.0 - }, - { - "x": 20.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "sel1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 105.0, - "y": 40.0 - }, - { - "x": 105.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "sel1#1", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 105.0, - "y": 105.0 - }, - { - "x": 105.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S1" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 15.0, - "y": 25.0 - }, - { - "x": 15.0, - "y": 10.0 - }, - { - "x": 85.0, - "y": 10.0 - }, - { - "x": 85.0, - "y": 25.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "mux2", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json deleted file mode 100644 index ac5aa8ae..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json +++ /dev/null @@ -1,483 +0,0 @@ -{ - "width": 80.0, - "height": 120.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 40.0 - }, - "name": "I000", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 50.0 - }, - "name": "I001", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 60.0 - }, - "name": "I010", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 70.0 - }, - "name": "I011", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 80.0 - }, - "name": "I100", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 90.0 - }, - "name": "I101", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 100.0 - }, - "name": "I110", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 110.0 - }, - "name": "I111", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 30.0 - }, - "name": "S0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 20.0 - }, - "name": "S1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 10.0 - }, - "name": "S2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 80.0, - "y": 10.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 19.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 94.0 - }, - "params": 1 - }, - { - "id": "mux1", - "name": "mux1#0", - "pos": { - "x": 125.0, - "y": 20.0 - } - }, - { - "id": "mux2", - "name": "mux2#0", - "pos": { - "x": 35.0, - "y": 185.0 - } - }, - { - "id": "mux2", - "name": "mux2#1", - "pos": { - "x": 35.0, - "y": 85.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 20.0, - "y": 75.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "S1" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 25.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "I11" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "I011" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 15.0, - "y": 145.0 - }, - { - "x": 15.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "I00" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "I100" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 10.0, - "y": 215.0 - }, - { - "x": 10.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I101" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I01" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "I10" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "I110" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 10.0, - "y": 235.0 - }, - { - "x": 10.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I111" - }, - "pin2": { - "compName": "mux2#0", - "pinName": "I11" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 15.0, - "y": 275.0 - }, - { - "x": 15.0, - "y": 245.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I1" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 115.0, - "y": 195.0 - }, - { - "x": 115.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "Y" - }, - "pin2": { - "compName": "mux1#0", - "pinName": "I0" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 110.0, - "y": 95.0 - }, - { - "x": 110.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "S0" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "S2" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "S1" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "S1" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 25.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#0", - "pinName": "S0" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 20.0, - "y": 205.0 - } - ] - }, - { - "pin1": { - "compName": "mux1#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I000" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I00" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 10.0, - "y": 100.0 - }, - { - "x": 10.0, - "y": 115.0 - } - ] - }, - { - "pin1": { - "compName": "mux2#1", - "pinName": "I01" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "I001" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I010" - }, - "pin2": { - "compName": "mux2#1", - "pinName": "I10" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 150.0 - }, - { - "x": 10.0, - "y": 135.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "mux3", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json deleted file mode 100644 index ced22619..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 10.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 35.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 62.5, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 31.5, - "y": 24.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#1" - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 32.5, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 32.5, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 57.5, - "y": 25.0 - }, - { - "x": 57.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 60.0, - "y": 62.5 - }, - { - "x": 60.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#7", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "nand3", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json deleted file mode 100644 index 4b4e51f1..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json +++ /dev/null @@ -1,401 +0,0 @@ -{ - "width": 35.0, - "height": 40.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 30.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 30.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 30.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 30.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 14.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 14.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 14.0, - "y": 61.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 14.0, - "y": 86.5 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 15.0, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 15.0, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 15.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 15.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 15.0, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 15.0, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 15.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 15.0, - "y": 42.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "not4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json deleted file mode 100644 index 33e50e58..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json +++ /dev/null @@ -1,558 +0,0 @@ -{ - "width": 35.0, - "height": 40.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 20.0, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 20.0, - "y": 65.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 20.0, - "y": 115.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 20.0, - "y": 165.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 50.0, - "y": 40.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 50.0, - "y": 140.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 110.0, - "y": 40.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 110.0, - "y": 140.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 140.0, - "y": 90.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 14.0, - "y": 24.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 14.0, - "y": 74.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 14.0, - "y": 124.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 14.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 104.0, - "y": 49.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 104.0, - "y": 149.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 15.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 15.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#12" - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#13" - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#14" - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#15" - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 105.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 105.0, - "y": 55.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 105.0, - "y": 145.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 105.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#22" - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "B" - }, - "name": "unnamedWire#23" - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#24" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 15.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 15.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 15.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 15.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 15.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 15.0, - "y": 80.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "or4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json deleted file mode 100644 index 46801b2f..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json +++ /dev/null @@ -1,897 +0,0 @@ -{ - "width": 35.0, - "height": 80.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 15.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 15.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 65.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 65.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 15.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 15.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 15.0, - "y": 102.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 15.0, - "y": 127.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 15.0, - "y": 152.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 15.0, - "y": 177.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 65.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 65.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 6.5, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 6.5, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 6.5, - "y": 61.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 6.5, - "y": 86.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 6.5, - "y": 111.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 6.5, - "y": 136.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 6.5, - "y": 161.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 6.5, - "y": 186.5 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 7.5, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 7.5, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 7.5, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 7.5, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 7.5, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 7.5, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 7.5, - "y": 107.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 7.5, - "y": 117.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 7.5, - "y": 132.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 7.5, - "y": 142.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 7.5, - "y": 157.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 7.5, - "y": 167.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 7.5, - "y": 182.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 7.5, - "y": 192.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 40.0, - "y": 12.5 - }, - { - "x": 40.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "B" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 45.0, - "y": 112.5 - }, - { - "x": 45.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "A" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 40.0, - "y": 37.5 - }, - { - "x": 40.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 50.0, - "y": 137.5 - }, - { - "x": 50.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 40.0, - "y": 62.5 - }, - { - "x": 40.0, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "B" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 55.0, - "y": 162.5 - }, - { - "x": 55.0, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 40.0, - "y": 87.5 - }, - { - "x": 40.0, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "B" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 60.0, - "y": 187.5 - }, - { - "x": 60.0, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 7.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 7.5, - "y": 17.5 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "or_4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json deleted file mode 100644 index 37322570..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json +++ /dev/null @@ -1,3029 +0,0 @@ -{ - "width": 35.0, - "height": 90.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "B0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "QA1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "QA2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "QA3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "QA4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "QB1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "QB2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 65.0 - }, - "name": "QB3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 75.0 - }, - "name": "QB4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.1, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 109.0, - "y": 154.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 104.0, - "y": 164.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 44.0, - "y": 499.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 49.0, - "y": 509.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 34.0, - "y": 629.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 39.0, - "y": 639.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 44.0, - "y": 649.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 49.0, - "y": 659.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 129.0, - "y": 329.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 124.0, - "y": 339.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 119.0, - "y": 349.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 114.0, - "y": 359.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 99.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 129.0, - "y": 479.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 124.0, - "y": 489.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 119.0, - "y": 499.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 114.0, - "y": 509.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 129.0, - "y": 629.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 124.0, - "y": 639.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 119.0, - "y": 649.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 114.0, - "y": 659.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#28", - "pos": { - "x": 129.0, - "y": 779.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#29", - "pos": { - "x": 124.0, - "y": 789.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 94.0, - "y": 184.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#30", - "pos": { - "x": 119.0, - "y": 799.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#31", - "pos": { - "x": 114.0, - "y": 809.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 34.0, - "y": 549.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 39.0, - "y": 649.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 44.0, - "y": 749.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 49.0, - "y": 809.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 34.0, - "y": 479.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 39.0, - "y": 489.0 - }, - "params": 1 - }, - { - "id": "and41", - "name": "and41#0", - "pos": { - "x": 130.0, - "y": 150.0 - } - }, - { - "id": "and41", - "name": "and41#1", - "pos": { - "x": 235.0, - "y": 375.0 - } - }, - { - "id": "and41", - "name": "and41#2", - "pos": { - "x": 135.0, - "y": 325.0 - } - }, - { - "id": "andor414", - "name": "andor414#0", - "pos": { - "x": 235.0, - "y": 485.0 - } - }, - { - "id": "andor414", - "name": "andor414#1", - "pos": { - "x": 235.0, - "y": 635.0 - } - }, - { - "id": "andor414", - "name": "andor414#2", - "pos": { - "x": 235.0, - "y": 785.0 - } - }, - { - "id": "andor414", - "name": "andor414#3", - "pos": { - "x": 135.0, - "y": 435.0 - } - }, - { - "id": "andor414", - "name": "andor414#4", - "pos": { - "x": 135.0, - "y": 585.0 - } - }, - { - "id": "andor414", - "name": "andor414#5", - "pos": { - "x": 135.0, - "y": 735.0 - } - }, - { - "id": "demux2", - "name": "demux2#0", - "pos": { - "x": 55.0, - "y": 45.0 - } - }, - { - "id": "demux2", - "name": "demux2#1", - "pos": { - "x": 55.0, - "y": 150.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#0", - "pos": { - "x": 55.0, - "y": 325.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#1", - "pos": { - "x": 55.0, - "y": 475.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#2", - "pos": { - "x": 55.0, - "y": 625.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#3", - "pos": { - "x": 55.0, - "y": 775.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A0" - }, - "pin2": { - "compName": "demux2#0", - "pinName": "S0" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "demux2#0", - "pinName": "S1" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 150.0 - }, - { - "x": 10.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A3" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A4" - }, - "name": "unnamedWire#100", - "path": [] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C1" - }, - "name": "unnamedWire#101", - "path": [ - { - "x": 290.0, - "y": 380.0 - }, - { - "x": 290.0, - "y": 445.0 - }, - { - "x": 230.0, - "y": 445.0 - }, - { - "x": 230.0, - "y": 490.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C2" - }, - "name": "unnamedWire#102", - "path": [ - { - "x": 285.0, - "y": 390.0 - }, - { - "x": 285.0, - "y": 440.0 - }, - { - "x": 225.0, - "y": 440.0 - }, - { - "x": 225.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C3" - }, - "name": "unnamedWire#103", - "path": [ - { - "x": 280.0, - "y": 400.0 - }, - { - "x": 280.0, - "y": 435.0 - }, - { - "x": 220.0, - "y": 435.0 - }, - { - "x": 220.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C4" - }, - "name": "unnamedWire#104", - "path": [ - { - "x": 275.0, - "y": 410.0 - }, - { - "x": 275.0, - "y": 430.0 - }, - { - "x": 215.0, - "y": 430.0 - }, - { - "x": 215.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C1" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 290.0, - "y": 490.0 - }, - { - "x": 290.0, - "y": 595.0 - }, - { - "x": 230.0, - "y": 595.0 - }, - { - "x": 230.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C2" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 285.0, - "y": 500.0 - }, - { - "x": 285.0, - "y": 590.0 - }, - { - "x": 225.0, - "y": 590.0 - }, - { - "x": 225.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C3" - }, - "name": "unnamedWire#107", - "path": [ - { - "x": 280.0, - "y": 510.0 - }, - { - "x": 280.0, - "y": 585.0 - }, - { - "x": 220.0, - "y": 585.0 - }, - { - "x": 220.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C4" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 275.0, - "y": 520.0 - }, - { - "x": 275.0, - "y": 580.0 - }, - { - "x": 215.0, - "y": 580.0 - }, - { - "x": 215.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C1" - }, - "name": "unnamedWire#109", - "path": [ - { - "x": 290.0, - "y": 640.0 - }, - { - "x": 290.0, - "y": 745.0 - }, - { - "x": 230.0, - "y": 745.0 - }, - { - "x": 230.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A4" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C2" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 285.0, - "y": 650.0 - }, - { - "x": 285.0, - "y": 740.0 - }, - { - "x": 225.0, - "y": 740.0 - }, - { - "x": 225.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C3" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 280.0, - "y": 660.0 - }, - { - "x": 280.0, - "y": 735.0 - }, - { - "x": 220.0, - "y": 735.0 - }, - { - "x": 220.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C4" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 275.0, - "y": 670.0 - }, - { - "x": 275.0, - "y": 730.0 - }, - { - "x": 215.0, - "y": 730.0 - }, - { - "x": 215.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA1" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 300.0, - "y": 790.0 - }, - { - "x": 300.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA2" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 305.0, - "y": 800.0 - }, - { - "x": 305.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA3" - }, - "name": "unnamedWire#115", - "path": [ - { - "x": 310.0, - "y": 810.0 - }, - { - "x": 310.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA4" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 315.0, - "y": 820.0 - }, - { - "x": 315.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C1" - }, - "name": "unnamedWire#117", - "path": [ - { - "x": 190.0, - "y": 330.0 - }, - { - "x": 190.0, - "y": 430.0 - }, - { - "x": 130.0, - "y": 430.0 - }, - { - "x": 130.0, - "y": 440.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C2" - }, - "name": "unnamedWire#118", - "path": [ - { - "x": 185.0, - "y": 340.0 - }, - { - "x": 185.0, - "y": 425.0 - }, - { - "x": 125.0, - "y": 425.0 - }, - { - "x": 125.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C3" - }, - "name": "unnamedWire#119", - "path": [ - { - "x": 180.0, - "y": 350.0 - }, - { - "x": 180.0, - "y": 420.0 - }, - { - "x": 120.0, - "y": 420.0 - }, - { - "x": 120.0, - "y": 460.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "and41#0", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 5.0, - "y": 450.0 - }, - { - "x": 5.0, - "y": 300.0 - }, - { - "x": 125.0, - "y": 300.0 - }, - { - "x": 125.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C4" - }, - "name": "unnamedWire#120", - "path": [ - { - "x": 175.0, - "y": 360.0 - }, - { - "x": 175.0, - "y": 415.0 - }, - { - "x": 115.0, - "y": 415.0 - }, - { - "x": 115.0, - "y": 470.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C1" - }, - "name": "unnamedWire#121", - "path": [ - { - "x": 190.0, - "y": 440.0 - }, - { - "x": 190.0, - "y": 580.0 - }, - { - "x": 130.0, - "y": 580.0 - }, - { - "x": 130.0, - "y": 590.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C2" - }, - "name": "unnamedWire#122", - "path": [ - { - "x": 185.0, - "y": 450.0 - }, - { - "x": 185.0, - "y": 575.0 - }, - { - "x": 125.0, - "y": 575.0 - }, - { - "x": 125.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C3" - }, - "name": "unnamedWire#123", - "path": [ - { - "x": 180.0, - "y": 460.0 - }, - { - "x": 180.0, - "y": 570.0 - }, - { - "x": 120.0, - "y": 570.0 - }, - { - "x": 120.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C4" - }, - "name": "unnamedWire#124", - "path": [ - { - "x": 175.0, - "y": 470.0 - }, - { - "x": 175.0, - "y": 565.0 - }, - { - "x": 115.0, - "y": 565.0 - }, - { - "x": 115.0, - "y": 620.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C1" - }, - "name": "unnamedWire#125", - "path": [ - { - "x": 190.0, - "y": 590.0 - }, - { - "x": 190.0, - "y": 730.0 - }, - { - "x": 130.0, - "y": 730.0 - }, - { - "x": 130.0, - "y": 740.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C2" - }, - "name": "unnamedWire#126", - "path": [ - { - "x": 185.0, - "y": 600.0 - }, - { - "x": 185.0, - "y": 725.0 - }, - { - "x": 125.0, - "y": 725.0 - }, - { - "x": 125.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C3" - }, - "name": "unnamedWire#127", - "path": [ - { - "x": 180.0, - "y": 610.0 - }, - { - "x": 180.0, - "y": 720.0 - }, - { - "x": 120.0, - "y": 720.0 - }, - { - "x": 120.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C4" - }, - "name": "unnamedWire#128", - "path": [ - { - "x": 175.0, - "y": 620.0 - }, - { - "x": 175.0, - "y": 715.0 - }, - { - "x": 115.0, - "y": 715.0 - }, - { - "x": 115.0, - "y": 770.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB1" - }, - "name": "unnamedWire#129", - "path": [ - { - "x": 190.0, - "y": 740.0 - }, - { - "x": 190.0, - "y": 880.0 - }, - { - "x": 325.0, - "y": 880.0 - }, - { - "x": 325.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "C" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 185.0, - "y": 155.0 - }, - { - "x": 185.0, - "y": 250.0 - }, - { - "x": 30.0, - "y": 250.0 - }, - { - "x": 30.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB2" - }, - "name": "unnamedWire#130", - "path": [ - { - "x": 185.0, - "y": 750.0 - }, - { - "x": 185.0, - "y": 885.0 - }, - { - "x": 330.0, - "y": 885.0 - }, - { - "x": 330.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB3" - }, - "name": "unnamedWire#131", - "path": [ - { - "x": 180.0, - "y": 760.0 - }, - { - "x": 180.0, - "y": 890.0 - }, - { - "x": 335.0, - "y": 890.0 - }, - { - "x": 335.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB4" - }, - "name": "unnamedWire#132", - "path": [ - { - "x": 175.0, - "y": 770.0 - }, - { - "x": 175.0, - "y": 895.0 - }, - { - "x": 340.0, - "y": 895.0 - }, - { - "x": 340.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "C" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 180.0, - "y": 165.0 - }, - { - "x": 180.0, - "y": 245.0 - }, - { - "x": 25.0, - "y": 245.0 - }, - { - "x": 25.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "dlatch4#2", - "pinName": "C" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 175.0, - "y": 175.0 - }, - { - "x": 175.0, - "y": 240.0 - }, - { - "x": 20.0, - "y": 240.0 - }, - { - "x": 20.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "dlatch4#3", - "pinName": "C" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 170.0, - "y": 185.0 - }, - { - "x": 170.0, - "y": 235.0 - }, - { - "x": 15.0, - "y": 235.0 - }, - { - "x": 15.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B0" - }, - "pin2": { - "compName": "demux2#1", - "pinName": "S0" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 250.0 - }, - { - "x": 5.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 50.0, - "y": 850.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D1" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 35.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D2" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 40.0, - "y": 340.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D3" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 45.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#0", - "pinName": "D4" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 50.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D1" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D2" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D3" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#1", - "pinName": "D4" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "demux2#1", - "pinName": "S1" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 350.0 - }, - { - "x": 10.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#2", - "pinName": "D1" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#2", - "pinName": "D2" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#2", - "pinName": "D3" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#2", - "pinName": "D4" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y00" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#3", - "pinName": "D1" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 35.0, - "y": 780.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#3", - "pinName": "D2" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 40.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#3", - "pinName": "D3" - }, - "name": "unnamedWire#43", - "path": [ - { - "x": 45.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "dlatch4#3", - "pinName": "D4" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#45", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "name": "unnamedWire#46", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "name": "unnamedWire#47", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#0", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "name": "unnamedWire#48", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y01" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#1", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#2", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#2", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#2", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#2", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#3", - "pinName": "Q1" - }, - "pin2": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#3", - "pinName": "Q2" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#3", - "pinName": "Q3" - }, - "pin2": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y10" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "dlatch4#3", - "pinName": "Q4" - }, - "pin2": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y00" - }, - "pin2": { - "compName": "and41#1", - "pinName": "B" - }, - "name": "unnamedWire#61", - "path": [ - { - "x": 210.0, - "y": 50.0 - }, - { - "x": 210.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y01" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "B" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 205.0, - "y": 60.0 - }, - { - "x": 205.0, - "y": 570.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y10" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "B" - }, - "name": "unnamedWire#63", - "path": [ - { - "x": 200.0, - "y": 70.0 - }, - { - "x": 200.0, - "y": 720.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y11" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "B" - }, - "name": "unnamedWire#64", - "path": [ - { - "x": 195.0, - "y": 80.0 - }, - { - "x": 195.0, - "y": 870.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and41#2", - "pinName": "B" - }, - "name": "unnamedWire#65", - "path": [ - { - "x": 110.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "B" - }, - "name": "unnamedWire#66", - "path": [ - { - "x": 105.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "B" - }, - "name": "unnamedWire#67", - "path": [ - { - "x": 100.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "B" - }, - "name": "unnamedWire#68", - "path": [ - { - "x": 95.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A1" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 130.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y11" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A2" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 125.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A3" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 120.0, - "y": 400.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A4" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 115.0, - "y": 410.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A1" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 130.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A2" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 125.0, - "y": 540.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A3" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 120.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A4" - }, - "name": "unnamedWire#76", - "path": [ - { - "x": 115.0, - "y": 560.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A1" - }, - "name": "unnamedWire#77", - "path": [ - { - "x": 130.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A2" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 125.0, - "y": 690.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A3" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 120.0, - "y": 700.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A1" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A4" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 115.0, - "y": 710.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A1" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 130.0, - "y": 830.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A2" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 125.0, - "y": 840.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A3" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 120.0, - "y": 850.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#31", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A4" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 115.0, - "y": 860.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A1" - }, - "name": "unnamedWire#85", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A2" - }, - "name": "unnamedWire#86", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A3" - }, - "name": "unnamedWire#87", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A4" - }, - "name": "unnamedWire#88", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A1" - }, - "name": "unnamedWire#89", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A2" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A2" - }, - "name": "unnamedWire#90", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A3" - }, - "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A4" - }, - "name": "unnamedWire#92", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A1" - }, - "name": "unnamedWire#93", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A2" - }, - "name": "unnamedWire#94", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A3" - }, - "name": "unnamedWire#95", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A4" - }, - "name": "unnamedWire#96", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#28", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A1" - }, - "name": "unnamedWire#97", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A2" - }, - "name": "unnamedWire#98", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#30", - "pinName": "" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A3" - }, - "name": "unnamedWire#99", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "ram2", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "c00": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch4#0" - } - }, - "c01": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch4#1" - } - }, - "c10": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch4#2" - } - }, - "c11": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch4#3" - } - } - }, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "c11.q", - "c10.q", - "c01.q", - "c00.q" - ], - "vectorPartLengthes": [ - 4, - 4, - 4, - 4 - ] - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json deleted file mode 100644 index de91b6be..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json +++ /dev/null @@ -1,3525 +0,0 @@ -{ - "width": 35.0, - "height": 130.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "B0", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "D1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 105.0 - }, - "name": "D2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 115.0 - }, - "name": "D3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 125.0 - }, - "name": "D4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "QA1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "QA2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "QA3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "QA4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 45.0 - }, - "name": "QB1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 55.0 - }, - "name": "QB2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 65.0 - }, - "name": "QB3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 75.0 - }, - "name": "QB4", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.1, - "submodel": { - "components": [ - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 229.0, - "y": 154.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 224.0, - "y": 164.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 69.0, - "y": 704.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", - "pos": { - "x": 74.0, - "y": 714.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#12", - "pos": { - "x": 59.0, - "y": 834.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 64.0, - "y": 844.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#14", - "pos": { - "x": 69.0, - "y": 854.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#15", - "pos": { - "x": 74.0, - "y": 864.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#16", - "pos": { - "x": 39.0, - "y": 484.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#17", - "pos": { - "x": 44.0, - "y": 494.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#18", - "pos": { - "x": 49.0, - "y": 504.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#19", - "pos": { - "x": 54.0, - "y": 514.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 219.0, - "y": 174.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#20", - "pos": { - "x": 39.0, - "y": 634.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#21", - "pos": { - "x": 44.0, - "y": 644.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#22", - "pos": { - "x": 49.0, - "y": 654.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#23", - "pos": { - "x": 54.0, - "y": 664.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#24", - "pos": { - "x": 39.0, - "y": 334.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#25", - "pos": { - "x": 44.0, - "y": 349.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#26", - "pos": { - "x": 49.0, - "y": 649.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#27", - "pos": { - "x": 54.0, - "y": 749.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 214.0, - "y": 184.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 59.0, - "y": 534.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 64.0, - "y": 544.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#6", - "pos": { - "x": 69.0, - "y": 554.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#7", - "pos": { - "x": 74.0, - "y": 564.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#8", - "pos": { - "x": 59.0, - "y": 684.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#9", - "pos": { - "x": 64.0, - "y": 694.0 - }, - "params": 1 - }, - { - "id": "and41", - "name": "and41#0", - "pos": { - "x": 235.0, - "y": 150.0 - } - }, - { - "id": "and41", - "name": "and41#1", - "pos": { - "x": 250.0, - "y": 375.0 - } - }, - { - "id": "and41", - "name": "and41#2", - "pos": { - "x": 155.0, - "y": 325.0 - } - }, - { - "id": "andor414", - "name": "andor414#0", - "pos": { - "x": 250.0, - "y": 485.0 - } - }, - { - "id": "andor414", - "name": "andor414#1", - "pos": { - "x": 250.0, - "y": 635.0 - } - }, - { - "id": "andor414", - "name": "andor414#2", - "pos": { - "x": 250.0, - "y": 785.0 - } - }, - { - "id": "andor414", - "name": "andor414#3", - "pos": { - "x": 155.0, - "y": 435.0 - } - }, - { - "id": "andor414", - "name": "andor414#4", - "pos": { - "x": 155.0, - "y": 585.0 - } - }, - { - "id": "andor414", - "name": "andor414#5", - "pos": { - "x": 155.0, - "y": 735.0 - } - }, - { - "id": "demux2", - "name": "demux2#0", - "pos": { - "x": 55.0, - "y": 45.0 - } - }, - { - "id": "demux2", - "name": "demux2#1", - "pos": { - "x": 55.0, - "y": 150.0 - } - }, - { - "id": "ram2", - "name": "ram2#0", - "pos": { - "x": 80.0, - "y": 330.0 - } - }, - { - "id": "ram2", - "name": "ram2#1", - "pos": { - "x": 80.0, - "y": 480.0 - } - }, - { - "id": "ram2", - "name": "ram2#2", - "pos": { - "x": 80.0, - "y": 630.0 - } - }, - { - "id": "ram2", - "name": "ram2#3", - "pos": { - "x": 80.0, - "y": 780.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A0" - }, - "pin2": { - "compName": "demux2#0", - "pinName": "S0" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "demux2#0", - "pinName": "S1" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 150.0 - }, - { - "x": 10.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A3" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QA4" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A4" - }, - "name": "unnamedWire#100", - "path": [ - { - "x": 140.0, - "y": 365.0 - }, - { - "x": 140.0, - "y": 360.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QA1" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A1" - }, - "name": "unnamedWire#101", - "path": [ - { - "x": 140.0, - "y": 485.0 - }, - { - "x": 140.0, - "y": 480.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QA2" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A2" - }, - "name": "unnamedWire#102", - "path": [ - { - "x": 140.0, - "y": 495.0 - }, - { - "x": 140.0, - "y": 490.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QA3" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A3" - }, - "name": "unnamedWire#103", - "path": [ - { - "x": 140.0, - "y": 505.0 - }, - { - "x": 140.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QA4" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "A4" - }, - "name": "unnamedWire#104", - "path": [ - { - "x": 140.0, - "y": 515.0 - }, - { - "x": 140.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QA1" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A1" - }, - "name": "unnamedWire#105", - "path": [ - { - "x": 140.0, - "y": 635.0 - }, - { - "x": 140.0, - "y": 630.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QA2" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A2" - }, - "name": "unnamedWire#106", - "path": [ - { - "x": 140.0, - "y": 645.0 - }, - { - "x": 140.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QA3" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A3" - }, - "name": "unnamedWire#107", - "path": [ - { - "x": 140.0, - "y": 655.0 - }, - { - "x": 140.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QA4" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "A4" - }, - "name": "unnamedWire#108", - "path": [ - { - "x": 140.0, - "y": 665.0 - }, - { - "x": 140.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QA1" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A1" - }, - "name": "unnamedWire#109", - "path": [ - { - "x": 140.0, - "y": 785.0 - }, - { - "x": 140.0, - "y": 780.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A4" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QA2" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A2" - }, - "name": "unnamedWire#110", - "path": [ - { - "x": 140.0, - "y": 795.0 - }, - { - "x": 140.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QA3" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A3" - }, - "name": "unnamedWire#111", - "path": [ - { - "x": 140.0, - "y": 805.0 - }, - { - "x": 140.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QA4" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "A4" - }, - "name": "unnamedWire#112", - "path": [ - { - "x": 140.0, - "y": 815.0 - }, - { - "x": 140.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C1" - }, - "name": "unnamedWire#113", - "path": [ - { - "x": 305.0, - "y": 380.0 - }, - { - "x": 305.0, - "y": 445.0 - }, - { - "x": 245.0, - "y": 445.0 - }, - { - "x": 245.0, - "y": 490.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C2" - }, - "name": "unnamedWire#114", - "path": [ - { - "x": 300.0, - "y": 390.0 - }, - { - "x": 300.0, - "y": 440.0 - }, - { - "x": 240.0, - "y": 440.0 - }, - { - "x": 240.0, - "y": 500.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C3" - }, - "name": "unnamedWire#115", - "path": [ - { - "x": 295.0, - "y": 400.0 - }, - { - "x": 295.0, - "y": 435.0 - }, - { - "x": 235.0, - "y": 435.0 - }, - { - "x": 235.0, - "y": 510.0 - } - ] - }, - { - "pin1": { - "compName": "and41#1", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "C4" - }, - "name": "unnamedWire#116", - "path": [ - { - "x": 290.0, - "y": 410.0 - }, - { - "x": 290.0, - "y": 430.0 - }, - { - "x": 230.0, - "y": 430.0 - }, - { - "x": 230.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C1" - }, - "name": "unnamedWire#117", - "path": [ - { - "x": 305.0, - "y": 490.0 - }, - { - "x": 305.0, - "y": 595.0 - }, - { - "x": 245.0, - "y": 595.0 - }, - { - "x": 245.0, - "y": 640.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C2" - }, - "name": "unnamedWire#118", - "path": [ - { - "x": 300.0, - "y": 500.0 - }, - { - "x": 300.0, - "y": 590.0 - }, - { - "x": 240.0, - "y": 590.0 - }, - { - "x": 240.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C3" - }, - "name": "unnamedWire#119", - "path": [ - { - "x": 295.0, - "y": 510.0 - }, - { - "x": 295.0, - "y": 585.0 - }, - { - "x": 235.0, - "y": 585.0 - }, - { - "x": 235.0, - "y": 660.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "and41#0", - "pinName": "B" - }, - "name": "unnamedWire#12", - "path": [ - { - "x": 15.0, - "y": 850.0 - }, - { - "x": 15.0, - "y": 195.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "C4" - }, - "name": "unnamedWire#120", - "path": [ - { - "x": 290.0, - "y": 520.0 - }, - { - "x": 290.0, - "y": 580.0 - }, - { - "x": 230.0, - "y": 580.0 - }, - { - "x": 230.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C1" - }, - "name": "unnamedWire#121", - "path": [ - { - "x": 305.0, - "y": 640.0 - }, - { - "x": 305.0, - "y": 745.0 - }, - { - "x": 245.0, - "y": 745.0 - }, - { - "x": 245.0, - "y": 790.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C2" - }, - "name": "unnamedWire#122", - "path": [ - { - "x": 300.0, - "y": 650.0 - }, - { - "x": 300.0, - "y": 740.0 - }, - { - "x": 240.0, - "y": 740.0 - }, - { - "x": 240.0, - "y": 800.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C3" - }, - "name": "unnamedWire#123", - "path": [ - { - "x": 295.0, - "y": 660.0 - }, - { - "x": 295.0, - "y": 735.0 - }, - { - "x": 235.0, - "y": 735.0 - }, - { - "x": 235.0, - "y": 810.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#1", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "C4" - }, - "name": "unnamedWire#124", - "path": [ - { - "x": 290.0, - "y": 670.0 - }, - { - "x": 290.0, - "y": 730.0 - }, - { - "x": 230.0, - "y": 730.0 - }, - { - "x": 230.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB1" - }, - "name": "unnamedWire#125", - "path": [ - { - "x": 330.0, - "y": 790.0 - }, - { - "x": 330.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB2" - }, - "name": "unnamedWire#126", - "path": [ - { - "x": 335.0, - "y": 800.0 - }, - { - "x": 335.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB3" - }, - "name": "unnamedWire#127", - "path": [ - { - "x": 340.0, - "y": 810.0 - }, - { - "x": 340.0, - "y": 650.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QB4" - }, - "name": "unnamedWire#128", - "path": [ - { - "x": 345.0, - "y": 820.0 - }, - { - "x": 345.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C1" - }, - "name": "unnamedWire#129", - "path": [ - { - "x": 210.0, - "y": 330.0 - }, - { - "x": 210.0, - "y": 430.0 - }, - { - "x": 150.0, - "y": 430.0 - }, - { - "x": 150.0, - "y": 440.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "WE" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 290.0, - "y": 155.0 - }, - { - "x": 290.0, - "y": 230.0 - }, - { - "x": 35.0, - "y": 230.0 - }, - { - "x": 35.0, - "y": 375.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C2" - }, - "name": "unnamedWire#130", - "path": [ - { - "x": 205.0, - "y": 340.0 - }, - { - "x": 205.0, - "y": 425.0 - }, - { - "x": 145.0, - "y": 425.0 - }, - { - "x": 145.0, - "y": 450.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C3" - }, - "name": "unnamedWire#131", - "path": [ - { - "x": 200.0, - "y": 350.0 - }, - { - "x": 200.0, - "y": 420.0 - }, - { - "x": 140.0, - "y": 420.0 - }, - { - "x": 140.0, - "y": 460.0 - } - ] - }, - { - "pin1": { - "compName": "and41#2", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "C4" - }, - "name": "unnamedWire#132", - "path": [ - { - "x": 195.0, - "y": 360.0 - }, - { - "x": 195.0, - "y": 415.0 - }, - { - "x": 135.0, - "y": 415.0 - }, - { - "x": 135.0, - "y": 470.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C1" - }, - "name": "unnamedWire#133", - "path": [ - { - "x": 210.0, - "y": 440.0 - }, - { - "x": 210.0, - "y": 580.0 - }, - { - "x": 150.0, - "y": 580.0 - }, - { - "x": 150.0, - "y": 590.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C2" - }, - "name": "unnamedWire#134", - "path": [ - { - "x": 205.0, - "y": 450.0 - }, - { - "x": 205.0, - "y": 575.0 - }, - { - "x": 145.0, - "y": 575.0 - }, - { - "x": 145.0, - "y": 600.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C3" - }, - "name": "unnamedWire#135", - "path": [ - { - "x": 200.0, - "y": 460.0 - }, - { - "x": 200.0, - "y": 570.0 - }, - { - "x": 140.0, - "y": 570.0 - }, - { - "x": 140.0, - "y": 610.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#3", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "C4" - }, - "name": "unnamedWire#136", - "path": [ - { - "x": 195.0, - "y": 470.0 - }, - { - "x": 195.0, - "y": 565.0 - }, - { - "x": 135.0, - "y": 565.0 - }, - { - "x": 135.0, - "y": 620.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y1" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C1" - }, - "name": "unnamedWire#137", - "path": [ - { - "x": 210.0, - "y": 590.0 - }, - { - "x": 210.0, - "y": 730.0 - }, - { - "x": 150.0, - "y": 730.0 - }, - { - "x": 150.0, - "y": 740.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y2" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C2" - }, - "name": "unnamedWire#138", - "path": [ - { - "x": 205.0, - "y": 600.0 - }, - { - "x": 205.0, - "y": 725.0 - }, - { - "x": 145.0, - "y": 725.0 - }, - { - "x": 145.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y3" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C3" - }, - "name": "unnamedWire#139", - "path": [ - { - "x": 200.0, - "y": 610.0 - }, - { - "x": 200.0, - "y": 720.0 - }, - { - "x": 140.0, - "y": 720.0 - }, - { - "x": 140.0, - "y": 760.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "WE" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 285.0, - "y": 165.0 - }, - { - "x": 285.0, - "y": 225.0 - }, - { - "x": 30.0, - "y": 225.0 - }, - { - "x": 30.0, - "y": 525.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#4", - "pinName": "Y4" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "C4" - }, - "name": "unnamedWire#140", - "path": [ - { - "x": 195.0, - "y": 620.0 - }, - { - "x": 195.0, - "y": 715.0 - }, - { - "x": 135.0, - "y": 715.0 - }, - { - "x": 135.0, - "y": 770.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y1" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA1" - }, - "name": "unnamedWire#141", - "path": [ - { - "x": 210.0, - "y": 740.0 - }, - { - "x": 210.0, - "y": 880.0 - }, - { - "x": 310.0, - "y": 880.0 - }, - { - "x": 310.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y2" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA2" - }, - "name": "unnamedWire#142", - "path": [ - { - "x": 205.0, - "y": 750.0 - }, - { - "x": 205.0, - "y": 885.0 - }, - { - "x": 315.0, - "y": 885.0 - }, - { - "x": 315.0, - "y": 150.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y3" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA3" - }, - "name": "unnamedWire#143", - "path": [ - { - "x": 200.0, - "y": 760.0 - }, - { - "x": 200.0, - "y": 890.0 - }, - { - "x": 320.0, - "y": 890.0 - }, - { - "x": 320.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "andor414#5", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "QA4" - }, - "name": "unnamedWire#144", - "path": [ - { - "x": 195.0, - "y": 770.0 - }, - { - "x": 195.0, - "y": 895.0 - }, - { - "x": 325.0, - "y": 895.0 - }, - { - "x": 325.0, - "y": 350.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "WE" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 280.0, - "y": 175.0 - }, - { - "x": 280.0, - "y": 220.0 - }, - { - "x": 25.0, - "y": 220.0 - }, - { - "x": 25.0, - "y": 675.0 - } - ] - }, - { - "pin1": { - "compName": "and41#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "WE" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 275.0, - "y": 185.0 - }, - { - "x": 275.0, - "y": 215.0 - }, - { - "x": 20.0, - "y": 215.0 - }, - { - "x": 20.0, - "y": 825.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "A0" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B0" - }, - "pin2": { - "compName": "demux2#1", - "pinName": "S0" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 450.0 - }, - { - "x": 5.0, - "y": 155.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "A1" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 45.0, - "y": 345.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "B0" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 50.0, - "y": 355.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "B1" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 55.0, - "y": 365.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "A0" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "A1" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "B0" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "B1" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#17", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#18", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "demux2#1", - "pinName": "S1" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 550.0 - }, - { - "x": 10.0, - "y": 165.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#26", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "A0" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "A1" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "B0" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "B1" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#20", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "A0" - }, - "name": "unnamedWire#37", - "path": [ - { - "x": 40.0, - "y": 785.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#21", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "A1" - }, - "name": "unnamedWire#38", - "path": [ - { - "x": 45.0, - "y": 795.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#22", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "B0" - }, - "name": "unnamedWire#39", - "path": [ - { - "x": 50.0, - "y": 805.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y00" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#23", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "B1" - }, - "name": "unnamedWire#41", - "path": [ - { - "x": 55.0, - "y": 815.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#24", - "pinName": "" - }, - "name": "unnamedWire#42", - "path": [ - { - "x": 40.0, - "y": 250.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "WireCrossPoint#25", - "pinName": "" - }, - "name": "unnamedWire#43", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "WireCrossPoint#27", - "pinName": "" - }, - "name": "unnamedWire#44", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "D1" - }, - "name": "unnamedWire#45", - "path": [ - { - "x": 60.0, - "y": 385.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "D2" - }, - "name": "unnamedWire#46", - "path": [ - { - "x": 65.0, - "y": 395.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "D3" - }, - "name": "unnamedWire#47", - "path": [ - { - "x": 70.0, - "y": 405.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "ram2#0", - "pinName": "D4" - }, - "name": "unnamedWire#48", - "path": [ - { - "x": 75.0, - "y": 415.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "D1" - }, - "name": "unnamedWire#49", - "path": [] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y01" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "D2" - }, - "name": "unnamedWire#50", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "D3" - }, - "name": "unnamedWire#51", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "ram2#1", - "pinName": "D4" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "name": "unnamedWire#54", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#55", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#7", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "name": "unnamedWire#56", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "D1" - }, - "name": "unnamedWire#57", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "D2" - }, - "name": "unnamedWire#58", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "D3" - }, - "name": "unnamedWire#59", - "path": [] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y10" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "ram2#2", - "pinName": "D4" - }, - "name": "unnamedWire#60", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#61", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#9", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#62", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#63", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#11", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#64", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "D1" - }, - "name": "unnamedWire#65", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "D2" - }, - "name": "unnamedWire#66", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "D3" - }, - "name": "unnamedWire#67", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { - "compName": "ram2#3", - "pinName": "D4" - }, - "name": "unnamedWire#68", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "WireCrossPoint#12", - "pinName": "" - }, - "name": "unnamedWire#69", - "path": [ - { - "x": 60.0, - "y": 950.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#1", - "pinName": "Y11" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D2" - }, - "pin2": { - "compName": "WireCrossPoint#13", - "pinName": "" - }, - "name": "unnamedWire#70", - "path": [ - { - "x": 65.0, - "y": 1050.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" - }, - "pin2": { - "compName": "WireCrossPoint#14", - "pinName": "" - }, - "name": "unnamedWire#71", - "path": [ - { - "x": 70.0, - "y": 1150.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D4" - }, - "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "name": "unnamedWire#72", - "path": [ - { - "x": 75.0, - "y": 1250.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y00" - }, - "pin2": { - "compName": "and41#2", - "pinName": "B" - }, - "name": "unnamedWire#73", - "path": [ - { - "x": 135.0, - "y": 50.0 - }, - { - "x": 135.0, - "y": 370.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y01" - }, - "pin2": { - "compName": "andor414#3", - "pinName": "B" - }, - "name": "unnamedWire#74", - "path": [ - { - "x": 130.0, - "y": 60.0 - }, - { - "x": 130.0, - "y": 520.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y10" - }, - "pin2": { - "compName": "andor414#4", - "pinName": "B" - }, - "name": "unnamedWire#75", - "path": [ - { - "x": 125.0, - "y": 70.0 - }, - { - "x": 125.0, - "y": 670.0 - } - ] - }, - { - "pin1": { - "compName": "demux2#0", - "pinName": "Y11" - }, - "pin2": { - "compName": "andor414#5", - "pinName": "B" - }, - "name": "unnamedWire#76", - "path": [ - { - "x": 120.0, - "y": 80.0 - }, - { - "x": 120.0, - "y": 820.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and41#1", - "pinName": "B" - }, - "name": "unnamedWire#77", - "path": [ - { - "x": 230.0, - "y": 420.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "B" - }, - "name": "unnamedWire#78", - "path": [ - { - "x": 225.0, - "y": 570.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "B" - }, - "name": "unnamedWire#79", - "path": [ - { - "x": 220.0, - "y": 720.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A1" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "B" - }, - "name": "unnamedWire#80", - "path": [ - { - "x": 215.0, - "y": 870.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QB1" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A1" - }, - "name": "unnamedWire#81", - "path": [ - { - "x": 140.0, - "y": 375.0 - }, - { - "x": 140.0, - "y": 380.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QB2" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A2" - }, - "name": "unnamedWire#82", - "path": [ - { - "x": 140.0, - "y": 385.0 - }, - { - "x": 140.0, - "y": 390.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QB3" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A3" - }, - "name": "unnamedWire#83", - "path": [ - { - "x": 140.0, - "y": 395.0 - }, - { - "x": 140.0, - "y": 400.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QB4" - }, - "pin2": { - "compName": "and41#1", - "pinName": "A4" - }, - "name": "unnamedWire#84", - "path": [ - { - "x": 140.0, - "y": 405.0 - }, - { - "x": 140.0, - "y": 410.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QB1" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A1" - }, - "name": "unnamedWire#85", - "path": [ - { - "x": 140.0, - "y": 525.0 - }, - { - "x": 140.0, - "y": 530.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QB2" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A2" - }, - "name": "unnamedWire#86", - "path": [ - { - "x": 140.0, - "y": 535.0 - }, - { - "x": 140.0, - "y": 540.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QB3" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A3" - }, - "name": "unnamedWire#87", - "path": [ - { - "x": 140.0, - "y": 545.0 - }, - { - "x": 140.0, - "y": 550.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#1", - "pinName": "QB4" - }, - "pin2": { - "compName": "andor414#0", - "pinName": "A4" - }, - "name": "unnamedWire#88", - "path": [ - { - "x": 140.0, - "y": 555.0 - }, - { - "x": 140.0, - "y": 560.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QB1" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A1" - }, - "name": "unnamedWire#89", - "path": [ - { - "x": 140.0, - "y": 675.0 - }, - { - "x": 140.0, - "y": 680.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "and41#0", - "pinName": "A2" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QB2" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A2" - }, - "name": "unnamedWire#90", - "path": [ - { - "x": 140.0, - "y": 685.0 - }, - { - "x": 140.0, - "y": 690.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QB3" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A3" - }, - "name": "unnamedWire#91", - "path": [ - { - "x": 140.0, - "y": 695.0 - }, - { - "x": 140.0, - "y": 700.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#2", - "pinName": "QB4" - }, - "pin2": { - "compName": "andor414#1", - "pinName": "A4" - }, - "name": "unnamedWire#92", - "path": [ - { - "x": 140.0, - "y": 705.0 - }, - { - "x": 140.0, - "y": 710.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QB1" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A1" - }, - "name": "unnamedWire#93", - "path": [ - { - "x": 140.0, - "y": 825.0 - }, - { - "x": 140.0, - "y": 830.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QB2" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A2" - }, - "name": "unnamedWire#94", - "path": [ - { - "x": 140.0, - "y": 835.0 - }, - { - "x": 140.0, - "y": 840.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QB3" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A3" - }, - "name": "unnamedWire#95", - "path": [ - { - "x": 140.0, - "y": 845.0 - }, - { - "x": 140.0, - "y": 850.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#3", - "pinName": "QB4" - }, - "pin2": { - "compName": "andor414#2", - "pinName": "A4" - }, - "name": "unnamedWire#96", - "path": [ - { - "x": 140.0, - "y": 855.0 - }, - { - "x": 140.0, - "y": 860.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QA1" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A1" - }, - "name": "unnamedWire#97", - "path": [ - { - "x": 140.0, - "y": 335.0 - }, - { - "x": 140.0, - "y": 330.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QA2" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A2" - }, - "name": "unnamedWire#98", - "path": [ - { - "x": 140.0, - "y": 345.0 - }, - { - "x": 140.0, - "y": 340.0 - } - ] - }, - { - "pin1": { - "compName": "ram2#0", - "pinName": "QA3" - }, - "pin2": { - "compName": "and41#2", - "pinName": "A3" - }, - "name": "unnamedWire#99", - "path": [ - { - "x": 140.0, - "y": 355.0 - }, - { - "x": 140.0, - "y": 350.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "ram4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "c00": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#0" - } - }, - "c0000": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#0", - "prefix": "c00" - } - }, - "c0001": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#1", - "prefix": "c00" - } - }, - "c0010": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#2", - "prefix": "c00" - } - }, - "c0011": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#3", - "prefix": "c00" - } - }, - "c01": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#1" - } - }, - "c0100": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#0", - "prefix": "c01" - } - }, - "c0101": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#1", - "prefix": "c01" - } - }, - "c0110": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#2", - "prefix": "c01" - } - }, - "c0111": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#3", - "prefix": "c01" - } - }, - "c10": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#2" - } - }, - "c1000": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#0", - "prefix": "c10" - } - }, - "c1001": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#1", - "prefix": "c10" - } - }, - "c1010": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#2", - "prefix": "c10" - } - }, - "c1011": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#3", - "prefix": "c10" - } - }, - "c11": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#3" - } - }, - "c1100": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#0", - "prefix": "c11" - } - }, - "c1101": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#1", - "prefix": "c11" - } - }, - "c1110": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#2", - "prefix": "c11" - } - }, - "c1111": { - "id": "delegating", - "params": { - "delegateTarget": "ram2#3", - "prefix": "c11" - } - } - }, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "c11.q", - "c10.q", - "c01.q", - "c00.q" - ], - "vectorPartLengthes": [ - 16, - 16, - 16, - 16 - ] - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json deleted file mode 100644 index afd89f18..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "width": 35.0, - "height": 40.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "I2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "S1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "S2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 35.0, - "y": 30.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 35.0, - "y": 55.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 60.0, - "y": 40.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S1" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 25.0, - "y": 12.5 - }, - { - "x": 25.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "S2" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 15.0, - "y": 37.5 - }, - { - "x": 15.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#10" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I1" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 25.0, - "y": 62.5 - }, - { - "x": 25.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I2" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 15.0, - "y": 87.5 - }, - { - "x": 15.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#8" - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "sel1", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json deleted file mode 100644 index 22f3ce64..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json +++ /dev/null @@ -1,863 +0,0 @@ -{ - "width": 35.0, - "height": 100.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "SA", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "SB", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 20.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 20.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#10", - "pos": { - "x": 65.0, - "y": 52.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#11", - "pos": { - "x": 65.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 20.0, - "y": 102.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 20.0, - "y": 152.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 20.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 20.0, - "y": 77.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 20.0, - "y": 127.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 20.0, - "y": 177.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#8", - "pos": { - "x": 65.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#9", - "pos": { - "x": 65.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 6.5, - "y": 16.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 6.5, - "y": 66.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 6.5, - "y": 116.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 4.0, - "y": 41.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#4", - "pos": { - "x": 4.0, - "y": 91.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#5", - "pos": { - "x": 4.0, - "y": 141.5 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 15.0, - "y": 62.5 - }, - { - "x": 15.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 17.5, - "y": 87.5 - }, - { - "x": 17.5, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#10" - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#11" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#12" - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#13" - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#14" - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 7.5, - "y": 167.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "name": "unnamedWire#16" - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#17" - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#18" - }, - { - "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#19" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 17.5, - "y": 112.5 - }, - { - "x": 17.5, - "y": 107.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#20" - }, - { - "pin1": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#21", - "path": [ - { - "x": 5.0, - "y": 192.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "A" - }, - "name": "unnamedWire#22", - "path": [ - { - "x": 42.5, - "y": 12.5 - }, - { - "x": 42.5, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#8", - "pinName": "B" - }, - "name": "unnamedWire#23", - "path": [ - { - "x": 45.0, - "y": 37.5 - }, - { - "x": 45.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "A" - }, - "name": "unnamedWire#24", - "path": [ - { - "x": 47.5, - "y": 62.5 - }, - { - "x": 47.5, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#9", - "pinName": "B" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 50.0, - "y": 87.5 - }, - { - "x": 50.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "A" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 52.5, - "y": 112.5 - }, - { - "x": 52.5, - "y": 57.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#10", - "pinName": "B" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 55.0, - "y": 137.5 - }, - { - "x": 55.0, - "y": 67.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "A" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 57.5, - "y": 162.5 - }, - { - "x": 57.5, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#11", - "pinName": "B" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 60.0, - "y": 187.5 - }, - { - "x": 60.0, - "y": 92.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 17.5, - "y": 137.5 - }, - { - "x": 17.5, - "y": 157.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#8", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#9", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#10", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#11", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 10.0, - "y": 162.5 - }, - { - "x": 10.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 12.5, - "y": 187.5 - }, - { - "x": 12.5, - "y": 82.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 15.0, - "y": 212.5 - }, - { - "x": 15.0, - "y": 132.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 10.0, - "y": 237.5 - }, - { - "x": 10.0, - "y": 182.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SA" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8" - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SB" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "sel2_4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json deleted file mode 100644 index c16624c8..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json +++ /dev/null @@ -1,937 +0,0 @@ -{ - "width": 35.0, - "height": 150.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 45.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 55.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 65.0 - }, - "name": "A4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 75.0 - }, - "name": "B1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 85.0 - }, - "name": "B2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 95.0 - }, - "name": "B3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 105.0 - }, - "name": "B4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 115.0 - }, - "name": "C1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 125.0 - }, - "name": "C2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 135.0 - }, - "name": "C3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 145.0 - }, - "name": "C4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "SA", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "SB", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "SC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 50.0, - "y": 570.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 50.0, - "y": 620.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 50.0, - "y": 670.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 50.0, - "y": 720.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#4", - "pos": { - "x": 152.5, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#5", - "pos": { - "x": 152.5, - "y": 65.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#6", - "pos": { - "x": 152.5, - "y": 115.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 152.5, - "y": 165.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 29.0, - "y": 584.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 29.0, - "y": 634.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 29.0, - "y": 684.0 - }, - "params": 1 - }, - { - "id": "not4", - "name": "not4#0", - "pos": { - "x": 75.0, - "y": 250.0 - } - }, - { - "id": "sel2_4", - "name": "sel2_4#0", - "pos": { - "x": 35.0, - "y": 250.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SA" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "SA" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 25.0, - "y": 25.0 - }, - { - "x": 25.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SB" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "SB" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 20.0, - "y": 75.0 - }, - { - "x": 20.0, - "y": 265.0 - } - ] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A2" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A3" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "sel2_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "not4#0", - "pinName": "A4" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SC" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 30.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 30.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 30.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A1" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 15.0, - "y": 175.0 - }, - { - "x": 15.0, - "y": 275.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#20", - "path": [ - { - "x": 30.0, - "y": 735.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C1" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C2" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C3" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C4" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "A" - }, - "name": "unnamedWire#25", - "path": [ - { - "x": 115.0, - "y": 255.0 - }, - { - "x": 115.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "A" - }, - "name": "unnamedWire#26", - "path": [ - { - "x": 120.0, - "y": 265.0 - }, - { - "x": 120.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y3" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "A" - }, - "name": "unnamedWire#27", - "path": [ - { - "x": 125.0, - "y": 275.0 - }, - { - "x": 125.0, - "y": 120.0 - } - ] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#28", - "path": [ - { - "x": 130.0, - "y": 285.0 - }, - { - "x": 130.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#4", - "pinName": "B" - }, - "name": "unnamedWire#29", - "path": [ - { - "x": 135.0, - "y": 580.0 - }, - { - "x": 135.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A2" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 10.0, - "y": 225.0 - }, - { - "x": 10.0, - "y": 285.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#5", - "pinName": "B" - }, - "name": "unnamedWire#30", - "path": [ - { - "x": 140.0, - "y": 630.0 - }, - { - "x": 140.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#6", - "pinName": "B" - }, - "name": "unnamedWire#31", - "path": [ - { - "x": 145.0, - "y": 680.0 - }, - { - "x": 145.0, - "y": 130.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#7", - "pinName": "B" - }, - "name": "unnamedWire#32", - "path": [ - { - "x": 150.0, - "y": 730.0 - }, - { - "x": 150.0, - "y": 180.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#4", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#6", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A3" - }, - "name": "unnamedWire#4", - "path": [ - { - "x": 5.0, - "y": 275.0 - }, - { - "x": 5.0, - "y": 295.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "A4" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 5.0, - "y": 325.0 - }, - { - "x": 5.0, - "y": 305.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B1" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B1" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 10.0, - "y": 375.0 - }, - { - "x": 10.0, - "y": 315.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B2" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B2" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 15.0, - "y": 425.0 - }, - { - "x": 15.0, - "y": 325.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B3" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B3" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 20.0, - "y": 475.0 - }, - { - "x": 20.0, - "y": 335.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B4" - }, - "pin2": { - "compName": "sel2_4#0", - "pinName": "B4" - }, - "name": "unnamedWire#9", - "path": [ - { - "x": 25.0, - "y": 525.0 - }, - { - "x": 25.0, - "y": 345.0 - } - ] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "sel3_4", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json deleted file mode 100644 index 2eff80ef..00000000 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json +++ /dev/null @@ -1,285 +0,0 @@ -{ - "width": 35.0, - "height": 20.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "A", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "B", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 5.0 - }, - "name": "Y", - "logicWidth": 1, - "usage": "OUTPUT" - } - ], - "innerScale": 0.4, - "submodel": { - "components": [ - { - "id": "NandGate", - "name": "NandGate#0", - "pos": { - "x": 7.5, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#1", - "pos": { - "x": 35.0, - "y": 2.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#2", - "pos": { - "x": 35.0, - "y": 27.5 - }, - "params": 1 - }, - { - "id": "NandGate", - "name": "NandGate#3", - "pos": { - "x": 62.5, - "y": 15.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 4.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 4.0, - "y": 36.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 29.0, - "y": 24.0 - }, - "params": 1 - } - ], - "wires": [ - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "B" - }, - "pin2": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#2", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "B" - }, - "name": "unnamedWire#10" - }, - { - "pin1": { - "compName": "NandGate#3", - "pinName": "Y" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y" - }, - "name": "unnamedWire#11" - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "A" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 5.0, - "y": 20.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#0", - "pinName": "B" - }, - "name": "unnamedWire#3", - "path": [ - { - "x": 5.0, - "y": 30.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4" - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "B" - }, - "name": "unnamedWire#5", - "path": [ - { - "x": 30.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "A" - }, - "name": "unnamedWire#6", - "path": [ - { - "x": 30.0, - "y": 32.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#1", - "pinName": "A" - }, - "name": "unnamedWire#7", - "path": [ - { - "x": 5.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "NandGate#2", - "pinName": "B" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 5.0, - "y": 42.5 - } - ] - }, - { - "pin1": { - "compName": "NandGate#1", - "pinName": "Y" - }, - "pin2": { - "compName": "NandGate#3", - "pinName": "A" - }, - "name": "unnamedWire#9" - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "xor", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/plugin.xml b/net.mograsim.logic.model.am2900/plugin.xml deleted file mode 100644 index 7a324ad9..00000000 --- a/net.mograsim.logic.model.am2900/plugin.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java deleted file mode 100644 index 10cf1412..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mograsim.logic.model.am2900; - -import java.util.concurrent.atomic.AtomicBoolean; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -import net.mograsim.logic.model.serializing.ClassLoaderBasedResourceLoader; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.machine.MachineLoader; - -public class Am2900Loader implements BundleActivator -{ - // TODO use dff16 in dff16_we & dff16_invwe - private static AtomicBoolean activated = new AtomicBoolean(false); - - @Override - public void start(BundleContext context) throws Exception - { - setup(); - } - - @Override - public void stop(BundleContext context) throws Exception - { - // nothing - } - - public static void setup() - { - if (activated.getAndSet(true)) - return; - ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(Am2900Loader.class.getClassLoader()); - IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader"); - IndirectModelComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json")); - MachineLoader.setup(); -// System.out.println("SETUP DONE"); // TODO: Debug - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java deleted file mode 100644 index 4450e07b..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemory.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import net.mograsim.logic.model.am2900.machine.Am2900Machine; -import net.mograsim.logic.model.am2900.machine.Am2900MachineDefinition; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.machine.standard.memory.ModelWordAddressableMemory; - -public class ModelAm2900MainMemory extends ModelWordAddressableMemory -{ - public ModelAm2900MainMemory(LogicModelModifiable model, String name) - { - super(model, Am2900MachineDefinition.getInstance().getMainMemoryDefinition(), name); - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "Am2900MainMemory"; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new ModelAm2900MainMemoryAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelAm2900MainMemory.class.getCanonicalName(), (m, p, n) -> - { - return new ModelAm2900MainMemory(m, n); - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemoryAdapter.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemoryAdapter.java deleted file mode 100644 index e5e34ebb..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MainMemoryAdapter.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import java.util.Map; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.modeladapter.CoreModelParameters; -import net.mograsim.logic.model.modeladapter.componentadapters.ComponentAdapter; -import net.mograsim.machine.standard.memory.CoreWordAddressableMemory; - -public class ModelAm2900MainMemoryAdapter implements ComponentAdapter -{ - - @Override - public Class getSupportedClass() - { - return ModelAm2900MainMemory.class; - } - - @Override - public void createAndLinkComponent(Timeline timeline, CoreModelParameters params, ModelAm2900MainMemory modelComponent, - Map logicWiresPerPin) - { - ReadWriteEnd data = logicWiresPerPin.get(modelComponent.getDataPin()).createReadWriteEnd(); - ReadEnd address = logicWiresPerPin.get(modelComponent.getAddressPin()).createReadOnlyEnd(); - ReadEnd mode = logicWiresPerPin.get(modelComponent.getReadWritePin()).createReadOnlyEnd(); - CoreWordAddressableMemory mem = new CoreWordAddressableMemory(timeline, 2, modelComponent.getMachine().getMainMemory(), data, mode, - address); - modelComponent.setCoreModelBinding(mem); - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java deleted file mode 100644 index cfd54c52..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemory.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import net.mograsim.logic.model.am2900.machine.Am2900Machine; -import net.mograsim.logic.model.am2900.machine.Am2900MachineDefinition; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.machine.mi.components.ModelMicroInstructionMemory; - -public class ModelAm2900MicroInstructionMemory extends ModelMicroInstructionMemory -{ - public ModelAm2900MicroInstructionMemory(LogicModelModifiable model, String name) - { - super(model, Am2900MachineDefinition.getInstance().getMicroInstructionMemoryDefinition(), name); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new ModelAm2900MicroInstructionMemoryAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelAm2900MicroInstructionMemory.class.getCanonicalName(), (m, p, n) -> - { - return new ModelAm2900MicroInstructionMemory(m, n); - }); - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "Am2900MicroInstructionMemory"; - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemoryAdapter.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemoryAdapter.java deleted file mode 100644 index 895c58a5..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/ModelAm2900MicroInstructionMemoryAdapter.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import java.util.Map; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.modeladapter.CoreModelParameters; -import net.mograsim.logic.model.modeladapter.componentadapters.ComponentAdapter; -import net.mograsim.machine.mi.components.CoreMicroInstructionMemory; - -public class ModelAm2900MicroInstructionMemoryAdapter implements ComponentAdapter -{ - - @Override - public Class getSupportedClass() - { - return ModelAm2900MicroInstructionMemory.class; - } - - @Override - public void createAndLinkComponent(Timeline timeline, CoreModelParameters params, ModelAm2900MicroInstructionMemory modelComponent, - Map logicWiresPerPin) - { - ReadWriteEnd data = logicWiresPerPin.get(modelComponent.getDataPin()).createReadWriteEnd(); - ReadEnd address = logicWiresPerPin.get(modelComponent.getAddressPin()).createReadOnlyEnd(); - CoreMicroInstructionMemory mem = new CoreMicroInstructionMemory(timeline, 2, - modelComponent.getMachine().getMicroInstructionMemory(), data, address); - modelComponent.setCoreModelBinding(mem); - } - -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java deleted file mode 100644 index 14500d5c..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java +++ /dev/null @@ -1,87 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Arrays; -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modeldff12 extends SimpleRectangularHardcodedModelComponent -{ - public Modeldff12(LogicModelModifiable model, String name) - { - super(model, "dff12", name, "D flip flop\n12 bits", false); - setSize(40, 20); - addPin(new Pin(model, this, "D", 12, PinUsage.INPUT, 20, 20), Position.TOP); - addPin(new Pin(model, this, "C", 1, PinUsage.INPUT, 0, 10), Position.RIGHT); - addPin(new Pin(model, this, "Y", 12, PinUsage.OUTPUT, 20, 0), Position.BOTTOM); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit[] QC = (Bit[]) lastState; - if (QC == null) - { - QC = new Bit[13]; - Arrays.fill(QC, U); - } - - Bit CVal = readEnds.get("C").getValue(); - - if (QC[12] == ZERO && CVal == ONE) - System.arraycopy(readEnds.get("D").getValues().getBits(), 0, QC, 0, 12); - - readWriteEnds.get("Y").feedSignals(Arrays.copyOfRange(QC, 0, 12)); - QC[12] = CVal; - - return QC; - } - - @Override - protected Object getHighLevelState(Object state, String stateID) - { - switch (stateID) - { - case "q": - return BitVector.of(Arrays.copyOfRange((Bit[]) state, 0, 12)); - default: - return super.getHighLevelState(state, stateID); - } - } - - @Override - protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) - { - switch (stateID) - { - case "q": - BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; - if (newHighLevelStateCasted.length() != 12) - throw new IllegalArgumentException("Expected BitVector of length 12, not " + newHighLevelStateCasted.length()); - System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 0, 12); - return lastState; - default: - return super.setHighLevelState(lastState, stateID, newHighLevelState); - } - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modeldff12.class.getCanonicalName(), (m, p, n) -> new Modeldff12(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java deleted file mode 100644 index a3e7047e..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Arrays; -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modeldff4_finewe extends SimpleRectangularHardcodedModelComponent -{ - public Modeldff4_finewe(LogicModelModifiable model, String name) - { - super(model, "dff4_finewe", name, "D flip flop\n4 bits", false); - setSize(35, 90); - addPin(new Pin(model, this, "C", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "_WE1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); - addPin(new Pin(model, this, "_WE2", 1, PinUsage.INPUT, 0, 25), Position.RIGHT); - addPin(new Pin(model, this, "_WE3", 1, PinUsage.INPUT, 0, 35), Position.RIGHT); - addPin(new Pin(model, this, "_WE4", 1, PinUsage.INPUT, 0, 45), Position.RIGHT); - addPin(new Pin(model, this, "D1", 1, PinUsage.INPUT, 0, 55), Position.RIGHT); - addPin(new Pin(model, this, "D2", 1, PinUsage.INPUT, 0, 65), Position.RIGHT); - addPin(new Pin(model, this, "D3", 1, PinUsage.INPUT, 0, 75), Position.RIGHT); - addPin(new Pin(model, this, "D4", 1, PinUsage.INPUT, 0, 85), Position.RIGHT); - addPin(new Pin(model, this, "Q1", 1, PinUsage.OUTPUT, 35, 5), Position.LEFT); - addPin(new Pin(model, this, "Q2", 1, PinUsage.OUTPUT, 35, 15), Position.LEFT); - addPin(new Pin(model, this, "Q3", 1, PinUsage.OUTPUT, 35, 25), Position.LEFT); - addPin(new Pin(model, this, "Q4", 1, PinUsage.OUTPUT, 35, 35), Position.LEFT); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit[] QC = (Bit[]) lastState; - if (QC == null) - QC = new Bit[] { U, U, U, U, U }; - - Bit CVal = readEnds.get("C").getValue(); - - if (QC[0] == ZERO && CVal == ONE) - for (int i = 1; i < 5; i++) - { - Bit WEiVal = readEnds.get("_WE" + i).getValue(); - if (WEiVal == X || WEiVal == Z) - QC[i] = X; - else if (WEiVal == U) - QC[i] = U; - else if (WEiVal == ZERO) - QC[i] = readEnds.get("D" + i).getValue(); - } - - QC[0] = CVal; - - readWriteEnds.get("Q1").feedSignals(QC[1]); - readWriteEnds.get("Q2").feedSignals(QC[2]); - readWriteEnds.get("Q3").feedSignals(QC[3]); - readWriteEnds.get("Q4").feedSignals(QC[4]); - - return QC; - } - - @Override - protected Object getHighLevelState(Object state, String stateID) - { - switch (stateID) - { - case "q": - return BitVector.of(Arrays.copyOfRange((Bit[]) state, 1, 5)); - default: - return super.getHighLevelState(state, stateID); - } - } - - @Override - protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) - { - switch (stateID) - { - case "q": - BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; - if (newHighLevelStateCasted.length() != 4) - throw new IllegalArgumentException("Expected BitVector of length 4, not " + newHighLevelStateCasted.length()); - System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 1, 4); - return lastState; - default: - return super.setHighLevelState(lastState, stateID, newHighLevelState); - } - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modeldff4_finewe.class.getCanonicalName(), - (m, p, n) -> new Modeldff4_finewe(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc.java deleted file mode 100644 index 981c8488..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc.java +++ /dev/null @@ -1,78 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Arrays; -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modelinc extends SimpleRectangularHardcodedModelComponent -{ - private final int logicWidth; - - public Modelinc(LogicModelModifiable model, String name, int logicWidth) - { - super(model, "inc", name, "Incrementer", false); - this.logicWidth = logicWidth; - setSize(40, 20); - addPin(new Pin(model, this, "A", logicWidth, PinUsage.INPUT, 20, 20), Position.TOP); - addPin(new Pin(model, this, "CI", 1, PinUsage.INPUT, 40, 10), Position.LEFT); - addPin(new Pin(model, this, "Y", logicWidth, PinUsage.OUTPUT, 20, 0), Position.BOTTOM); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit[] ABits = readEnds.get("A").getValues().getBits(); - Bit CIVal = readEnds.get("CI").getValue(); - Bit[] YBits = new Bit[logicWidth]; - if (CIVal == X) - Arrays.fill(YBits, X); - else if (CIVal == U) - Arrays.fill(YBits, U); - else if (CIVal == Z) - Arrays.fill(YBits, X); - else if (CIVal == ZERO) - YBits = ABits; - else - { - Bit carry = Bit.ONE; - // TODO extract to helper. This code almost also exists in ModelAm2910RegCntr. - for (int i = logicWidth - 1; i >= 0; i--) - { - Bit a = ABits[i]; - YBits[i] = a.xor(carry); - carry = a.and(carry); - } - } - readWriteEnds.get("Y").feedSignals(YBits); - return null; - } - - @Override - public Integer getParamsForSerializing(IdentifyParams idParams) - { - return logicWidth; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modelinc.class.getCanonicalName(), - (m, p, n) -> new Modelinc(m, n, p.getAsInt())); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java deleted file mode 100644 index 4304d4a2..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java +++ /dev/null @@ -1,61 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modelnor12 extends SimpleRectangularHardcodedModelComponent -{ - public Modelnor12(LogicModelModifiable model, String name) - { - super(model, "nor12", name, "=0", false); - setSize(35, 20); - addPin(new Pin(model, this, "D", 12, PinUsage.INPUT, 0, 10), Position.RIGHT); - addPin(new Pin(model, this, "Y", 1, PinUsage.OUTPUT, 35, 10), Position.LEFT); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - readWriteEnds.get("Y").feedSignals(getResult(readEnds.get("D").getValues().getBits())); - return null; - } - - private static Bit getResult(Bit[] DValArr) - { - for (int i = 0; i < 12; i++) - if (DValArr[i] == X) - return X; - for (int i = 0; i < 12; i++) - if (DValArr[i] == U) - return U; - for (int i = 0; i < 12; i++) - if (DValArr[i] == ONE) - return ZERO; - for (int i = 0; i < 12; i++) - if (DValArr[i] == Z) - return X; - return ONE; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modelnor12.class.getCanonicalName(), (m, p, n) -> new Modelnor12(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java deleted file mode 100644 index 53c9960d..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java +++ /dev/null @@ -1,121 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Arrays; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modelram5_12 extends SimpleRectangularHardcodedModelComponent -{ - public Modelram5_12(LogicModelModifiable model, String name) - { - super(model, "ram5_12", name, "RAM\n5 x 12 Bit", false); - setSize(40, 40); - addPin(new Pin(model, this, "A", 3, PinUsage.INPUT, 10, 0), Position.BOTTOM); - addPin(new Pin(model, this, "B", 3, PinUsage.INPUT, 30, 0), Position.BOTTOM); - addPin(new Pin(model, this, "WE", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "C", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); - addPin(new Pin(model, this, "Y", 12, PinUsage.OUTPUT, 0, 30), Position.RIGHT); - addPin(new Pin(model, this, "D", 12, PinUsage.INPUT, 20, 40), Position.TOP); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - BitVector[] memC = (BitVector[]) lastState; - if (memC == null) - { - memC = new BitVector[6]; - Arrays.fill(memC, 0, 5, BitVector.of(U, 12)); - memC[5] = BitVector.of(U); - } - BitVector CVal = readEnds.get("C").getValues(); - BitVector oldC = memC[5]; - // TODO is the timing right? - if (oldC.getLSBit(0) == ZERO && CVal.getLSBit(0) == ONE && readEnds.get("WE").getValue() == ONE) - { - int BInt = getAsInt(readEnds.get("B").getValues()); - if (BInt == -1 || BInt > 4) - Arrays.fill(memC, BitVector.of(X, 12)); - else if (BInt == -2) - Arrays.fill(memC, BitVector.of(U, 12)); - else - memC[BInt] = readEnds.get("D").getValues(); - } - int AInt = getAsInt(readEnds.get("A").getValues()); - BitVector YVal = AInt == -1 || AInt > 4 ? BitVector.of(X, 12) : AInt == -2 ? BitVector.of(U, 12) : memC[AInt]; - readWriteEnds.get("Y").feedSignals(YVal); - memC[5] = CVal; - return memC; - } - - /** - * -1 means X, -2 means U - */ - private static int getAsInt(BitVector vect) - { - Bit[] bits = vect.getBits(); - for (int i = 0; i < 3; i++) - if (bits[i] == X) - return -1; - for (int i = 0; i < 3; i++) - if (bits[i] == U) - return -2; - for (int i = 0; i < 3; i++) - if (bits[i] == Z) - return -1; - return (bits[0] == ONE ? 4 : 0) + (bits[1] == ONE ? 2 : 0) + (bits[2] == ONE ? 1 : 0); - } - - Pattern stateIDPattern = Pattern.compile("c(0[10][10]|100)"); - - @Override - protected Object getHighLevelState(Object state, String stateID) - { - Matcher m = stateIDPattern.matcher(stateID); - if (m.matches()) - return ((BitVector[]) state)[Integer.parseInt(m.group(1), 2)]; - return super.getHighLevelState(state, stateID); - } - - @Override - protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) - { - Matcher m = stateIDPattern.matcher(stateID); - if (m.matches()) - { - int addr = Integer.parseInt(m.group(1), 2); - BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; - if (newHighLevelStateCasted.length() != 12) - throw new IllegalArgumentException("Expected BitVector of length 12, not " + newHighLevelStateCasted.length()); - BitVector[] memC = (BitVector[]) lastState; - memC[addr] = newHighLevelStateCasted; - return memC; - } - return super.setHighLevelState(lastState, stateID, newHighLevelState); - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modelram5_12.class.getCanonicalName(), (m, p, n) -> new Modelram5_12(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java deleted file mode 100644 index 7cce14a3..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java +++ /dev/null @@ -1,87 +0,0 @@ -package net.mograsim.logic.model.am2900.components; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class Modelsel4_12 extends SimpleRectangularHardcodedModelComponent -{ - public Modelsel4_12(LogicModelModifiable model, String name) - { - super(model, "sel4_12", name, "4-way SEL\n12 bit", false); - setSize(80, 40); - addPin(new Pin(model, this, "SA", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "SB", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); - addPin(new Pin(model, this, "SC", 1, PinUsage.INPUT, 0, 25), Position.RIGHT); - addPin(new Pin(model, this, "SD", 1, PinUsage.INPUT, 0, 35), Position.RIGHT); - addPin(new Pin(model, this, "A", 12, PinUsage.INPUT, 10, 0), Position.BOTTOM); - addPin(new Pin(model, this, "B", 12, PinUsage.INPUT, 30, 0), Position.BOTTOM); - addPin(new Pin(model, this, "C", 12, PinUsage.INPUT, 50, 0), Position.BOTTOM); - addPin(new Pin(model, this, "D", 12, PinUsage.INPUT, 70, 0), Position.BOTTOM); - addPin(new Pin(model, this, "Y", 12, PinUsage.OUTPUT, 40, 40), Position.TOP); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit SAVal = readEnds.get("SA").getValue(); - Bit SBVal = readEnds.get("SB").getValue(); - Bit SCVal = readEnds.get("SC").getValue(); - Bit SDVal = readEnds.get("SD").getValue(); - BitVector YVal; - if (SAVal == X || SBVal == X || SCVal == X || SDVal == X) - YVal = BitVector.of(X, 12); - else if (SAVal == U || SBVal == U || SCVal == U || SDVal == U) - YVal = BitVector.of(U, 12); - else if (SAVal == Z || SBVal == Z || SCVal == Z || SDVal == Z) - YVal = BitVector.of(X, 12); - else - { - YVal = null; - if (SAVal == ONE) - YVal = readEnds.get("A").getValues(); - if (SBVal == ONE) - if (YVal != null) - YVal = BitVector.of(X, 12); - else - YVal = readEnds.get("B").getValues(); - if (SCVal == ONE) - if (YVal != null) - YVal = BitVector.of(X, 12); - else - YVal = readEnds.get("C").getValues(); - if (SDVal == ONE) - if (YVal != null) - YVal = BitVector.of(X, 12); - else - YVal = readEnds.get("D").getValues(); - if (YVal == null) - YVal = BitVector.of(ZERO, 12); - } - - readWriteEnds.get("Y").feedSignals(YVal); - return null; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(Modelsel4_12.class.getCanonicalName(), (m, p, n) -> new Modelsel4_12(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java deleted file mode 100644 index 880d17c9..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java +++ /dev/null @@ -1,286 +0,0 @@ -package net.mograsim.logic.model.am2900.components.am2904; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class ModelAm2904RegCTInstrDecode extends SimpleRectangularHardcodedModelComponent -{ - public ModelAm2904RegCTInstrDecode(LogicModelModifiable model, String name) - { - super(model, "Am2904RegCTInstrDecode", name, "Instruction\ndecode", false); - setSize(80, 80); - addPin(new Pin(model, this, "I12-11", 2, PinUsage.INPUT, 0, 30), Position.RIGHT); - addPin(new Pin(model, this, "I5-0", 6, PinUsage.INPUT, 0, 50), Position.RIGHT); - // muSR MUX: - // 00: 0 - // 01: 1 - // 10: M - // 11: I - addPin(new Pin(model, this, "muSR_MUX", 2, PinUsage.OUTPUT, 80, 10), Position.LEFT); - addPin(new Pin(model, this, "muSR_OVRRET", 1, PinUsage.OUTPUT, 80, 20), Position.LEFT); - addPin(new Pin(model, this, "muSR_CINV", 1, PinUsage.OUTPUT, 80, 30), Position.LEFT); - addPin(new Pin(model, this, "muSR_WEZ", 1, PinUsage.OUTPUT, 80, 40), Position.LEFT); - addPin(new Pin(model, this, "muSR_WEC", 1, PinUsage.OUTPUT, 80, 50), Position.LEFT); - addPin(new Pin(model, this, "muSR_WEN", 1, PinUsage.OUTPUT, 80, 60), Position.LEFT); - addPin(new Pin(model, this, "muSR_WEOVR", 1, PinUsage.OUTPUT, 80, 70), Position.LEFT); - // MSR MUX: - // 000: 0 - // 001: 1 - // 010: mu - // 011: Y - // 100: I - // 101: I, invert C - // 110: Swap OVR and C - // 111: _M - addPin(new Pin(model, this, "MSR_MUX", 3, PinUsage.OUTPUT, 20, 0), Position.BOTTOM); - addPin(new Pin(model, this, "OEN", 1, PinUsage.OUTPUT, 60, 0), Position.BOTTOM); - // Y MUX: - // 00: mu - // 01: mu - // 10: M - // 11: I - addPin(new Pin(model, this, "Y_MUX", 2, PinUsage.OUTPUT, 10, 80), Position.TOP); - // CT MUX: - // see Am2900 Family Data Book, Am2904, Table 4 (CT_MUX2-0 = I3-1) - addPin(new Pin(model, this, "CT_MUX", 3, PinUsage.OUTPUT, 30, 80), Position.TOP); - addPin(new Pin(model, this, "CT_INV", 1, PinUsage.OUTPUT, 40, 80), Position.TOP); - addPin(new Pin(model, this, "CT_EXP", 1, PinUsage.OUTPUT, 50, 80), Position.TOP); - // C0 MUX: - // 00xx: 0 - // 01xx: 1 - // 10xx: CX - // 1100: muC - // 1101: _muC - // 1110: MC - // 1111: _MC - addPin(new Pin(model, this, "C0_MUX", 4, PinUsage.OUTPUT, 70, 80), Position.TOP); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit[] I5_0Bits = readEnds.get("I5-0").getValues().getBits(); - Bit[] I12_11Bits = readEnds.get("I12-11").getValues().getBits(); - int IAsInt = 0; - for (int i = 0; i < 6; i++) - switch (I5_0Bits[5 - i]) - { - case ONE: - IAsInt |= 1 << i; - break; - case U: - for (ReadWriteEnd e : readWriteEnds.values()) - e.feedSignals(BitVector.of(U, e.width())); - return null; - case X: - case Z: - for (ReadWriteEnd e : readWriteEnds.values()) - e.feedSignals(BitVector.of(X, e.width())); - return null; - case ZERO: - break; - default: - throw new IllegalArgumentException("Unknown enum constant: " + I5_0Bits[i]); - } - switch (IAsInt) - { - case 0: - case 2: - readWriteEnds.get("muSR_MUX").feedSignals(ONE, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 1: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 3: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 6: - case 7: - readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ONE); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 8: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 9: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 10: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 11: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 12: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 13: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ZERO); - break; - case 14: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ZERO); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 15: - readWriteEnds.get("muSR_MUX").feedSignals(ZERO, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ZERO); - readWriteEnds.get("muSR_WEC").feedSignals(ZERO); - readWriteEnds.get("muSR_WEN").feedSignals(ZERO); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - case 24: - case 25: - case 40: - case 41: - case 56: - case 57: - readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ONE); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - break; - default: - readWriteEnds.get("muSR_MUX").feedSignals(ONE, ONE); - readWriteEnds.get("muSR_OVRRET").feedSignals(ZERO); - readWriteEnds.get("muSR_CINV").feedSignals(ZERO); - readWriteEnds.get("muSR_WEZ").feedSignals(ONE); - readWriteEnds.get("muSR_WEC").feedSignals(ONE); - readWriteEnds.get("muSR_WEN").feedSignals(ONE); - readWriteEnds.get("muSR_WEOVR").feedSignals(ONE); - } - switch (IAsInt) - { - case 0: - readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ONE); - break; - case 1: - readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ONE); - break; - case 2: - readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ONE, ZERO); - break; - case 3: - readWriteEnds.get("MSR_MUX").feedSignals(ZERO, ZERO, ZERO); - break; - case 4: - readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ZERO); - break; - case 5: - readWriteEnds.get("MSR_MUX").feedSignals(ONE, ONE, ONE); - break; - case 8: - case 9: - case 24: - case 25: - case 40: - case 41: - case 56: - case 57: - readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ONE); - break; - default: - readWriteEnds.get("MSR_MUX").feedSignals(ONE, ZERO, ZERO); - break; - } - readWriteEnds.get("OEN").feedSignals(I5_0Bits[0].or(I5_0Bits[1]).or(I5_0Bits[2]).or(I5_0Bits[3]).or(I5_0Bits[4]).or(I5_0Bits[5])); - readWriteEnds.get("Y_MUX").feedSignals(I5_0Bits[0], I5_0Bits[1]); - readWriteEnds.get("CT_INV").feedSignals(I5_0Bits[5]); - readWriteEnds.get("CT_MUX").feedSignals(I5_0Bits[2], I5_0Bits[3], I5_0Bits[4]); - readWriteEnds.get("CT_EXP").feedSignals((IAsInt & 0b111110) == 0b001110 ? ONE : ZERO); - readWriteEnds.get("C0_MUX").feedSignals(I12_11Bits[0], I12_11Bits[1], I5_0Bits[0], - I5_0Bits[2].and(I5_0Bits[3].not()).and(I5_0Bits[4].not())); - return null; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(ModelAm2904RegCTInstrDecode.class.getCanonicalName(), - (m, p, n) -> new ModelAm2904RegCTInstrDecode(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java deleted file mode 100644 index 3e97cc6c..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java +++ /dev/null @@ -1,323 +0,0 @@ -package net.mograsim.logic.model.am2900.components.am2904; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.Z; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class ModelAm2904ShiftInstrDecode extends SimpleRectangularHardcodedModelComponent -{ - public ModelAm2904ShiftInstrDecode(LogicModelModifiable model, String name) - { - super(model, "Am2904ShiftInstrDecode", name, "Shift \ninstruction\ndecode", false); - setSize(60, 80); - addPin(new Pin(model, this, "I", 5, PinUsage.INPUT, 0, 25), Position.RIGHT); - addPin(new Pin(model, this, "_SE", 1, PinUsage.INPUT, 0, 55), Position.RIGHT); - // SIO0 MUX: - // 000: 0 - // 001: 1 - // 01x: SIOn - // 10x: QIOn - // 11x: MC - addPin(new Pin(model, this, "SIO0_MUX", 3, PinUsage.OUTPUT, 60, 5), Position.LEFT); - // SIOn MUX: - // 000: 0 - // 001: 1 - // 010: SIO0 - // 011: QIO0 - // 100: MC - // 101: MN - // 110: IC - // 111: IN xor IVOR - addPin(new Pin(model, this, "SIOn_MUX", 3, PinUsage.OUTPUT, 60, 15), Position.LEFT); - // QIO0 MUX: - // 000: 0 - // 001: 1 - // 01x: SIOn - // 10x: QIOn - // 11x: MC - addPin(new Pin(model, this, "QIO0_MUX", 3, PinUsage.OUTPUT, 60, 25), Position.LEFT); - // QIOn MUX: - // 000: 0 - // 001: 1 - // 01x: SIO0 - // 10x: QIO0 - // 11x: MN - addPin(new Pin(model, this, "QIOn_MUX", 3, PinUsage.OUTPUT, 60, 35), Position.LEFT); - addPin(new Pin(model, this, "OEn", 1, PinUsage.OUTPUT, 60, 45), Position.LEFT); - addPin(new Pin(model, this, "OE0", 1, PinUsage.OUTPUT, 60, 55), Position.LEFT); - // 00: SIO0 - // 01: QIO0 - // 1x: SIOn - addPin(new Pin(model, this, "MC_MUX", 2, PinUsage.OUTPUT, 60, 65), Position.LEFT); - addPin(new Pin(model, this, "MC_EN", 1, PinUsage.OUTPUT, 60, 75), Position.LEFT); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit _SE = readEnds.get("_SE").getValue(); - BitVector I = readEnds.get("I").getValues(); - readWriteEnds.get("OEn").feedSignals(I.getMSBit(0).not().and(_SE.not())); - readWriteEnds.get("OE0").feedSignals(I.getMSBit(0).and(_SE.not())); - if (_SE == Z || _SE == X) - { - readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); - readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); - readWriteEnds.get("MC_MUX").feedSignals(X, X); - readWriteEnds.get("MC_EN").feedSignals(X); - return null; - } else if (_SE == U) - { - - readWriteEnds.get("SIO0_MUX").feedSignals(U, U, U); - readWriteEnds.get("SIOn_MUX").feedSignals(U, U, U); - readWriteEnds.get("QIO0_MUX").feedSignals(U, U, U); - readWriteEnds.get("QIOn_MUX").feedSignals(U, U, U); - readWriteEnds.get("MC_MUX").feedSignals(U, U); - readWriteEnds.get("MC_EN").feedSignals(U); - return null; - } else if (_SE == ONE) - { - readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); - readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); - readWriteEnds.get("MC_MUX").feedSignals(X, X); - readWriteEnds.get("MC_EN").feedSignals(ZERO); - return null; - } - if (!I.isBinary()) - { - Bit val = null; - for (Bit b : I.getBits()) - if (!b.isBinary()) - { - val = b; - break; - } - readWriteEnds.get("SIO0_MUX").feedSignals(val, val, val); - readWriteEnds.get("SIOn_MUX").feedSignals(val, val, val); - readWriteEnds.get("QIO0_MUX").feedSignals(val, val, val); - readWriteEnds.get("QIOn_MUX").feedSignals(val, val, val); - readWriteEnds.get("MC_MUX").feedSignals(val, val); - readWriteEnds.get("MC_EN").feedSignals(val); - return null; - } - int IAsInt = I.getUnsignedValue().intValue(); - if (IAsInt < 16) - { - readWriteEnds.get("SIO0_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIO0_MUX").feedSignals(X, X, X); - switch (IAsInt) - { - case 0: - case 2: - case 6: - case 7: - readWriteEnds.get("SIOn_MUX").feedSignals(ZERO, ZERO, ZERO); - break; - case 1: - case 3: - readWriteEnds.get("SIOn_MUX").feedSignals(ZERO, ZERO, ONE); - break; - case 4: - case 9: - case 12: - readWriteEnds.get("SIOn_MUX").feedSignals(ONE, ZERO, ZERO); - break; - case 5: - readWriteEnds.get("SIOn_MUX").feedSignals(ONE, ZERO, ONE); - break; - case 8: - case 10: - readWriteEnds.get("SIOn_MUX").feedSignals(ZERO, ONE, ZERO); - break; - case 11: - readWriteEnds.get("SIOn_MUX").feedSignals(ONE, ONE, ZERO); - break; - case 13: - case 15: - readWriteEnds.get("SIOn_MUX").feedSignals(ZERO, ONE, ONE); - break; - case 14: - readWriteEnds.get("SIOn_MUX").feedSignals(ONE, ONE, ONE); - break; - default: - throw new IllegalStateException("can't happen"); - } - switch (IAsInt) - { - case 0: - readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ZERO, ZERO); - break; - case 1: - readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ZERO, ONE); - break; - case 2: - readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ONE, X); - break; - case 3: - case 4: - case 5: - case 6: - case 7: - case 11: - case 12: - case 13: - case 14: - case 15: - readWriteEnds.get("QIOn_MUX").feedSignals(ZERO, ONE, X); - break; - case 8: - case 9: - case 10: - readWriteEnds.get("QIOn_MUX").feedSignals(ONE, ZERO, X); - break; - default: - throw new IllegalStateException("can't happen"); - } - } else - { - readWriteEnds.get("SIOn_MUX").feedSignals(X, X, X); - readWriteEnds.get("QIOn_MUX").feedSignals(X, X, X); - switch (IAsInt) - { - case 16: - case 18: - readWriteEnds.get("SIO0_MUX").feedSignals(ZERO, ZERO, ZERO); - break; - case 17: - case 19: - readWriteEnds.get("SIO0_MUX").feedSignals(ZERO, ZERO, ONE); - break; - case 20: - case 21: - case 22: - case 23: - case 28: - case 29: - case 30: - case 31: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, X); - break; - case 24: - case 26: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, X); - break; - case 25: - case 27: - readWriteEnds.get("SIO0_MUX").feedSignals(ZERO, ONE, X); - break; - default: - throw new IllegalStateException("can't happen"); - } - switch (IAsInt) - { - case 16: - case 18: - case 20: - case 22: - case 27: - readWriteEnds.get("QIO0_MUX").feedSignals(ZERO, ZERO, ZERO); - break; - case 17: - case 19: - case 21: - case 23: - readWriteEnds.get("QIO0_MUX").feedSignals(ZERO, ZERO, ONE); - break; - case 24: - case 25: - case 26: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ZERO, X); - break; - case 28: - case 30: - readWriteEnds.get("SIO0_MUX").feedSignals(ONE, ONE, X); - break; - case 29: - case 31: - readWriteEnds.get("QIO0_MUX").feedSignals(ZERO, ONE, X); - break; - default: - throw new IllegalStateException("can't happen"); - } - } - // MC - switch (IAsInt) - { - case 0: - case 1: - case 3: - case 4: - case 5: - case 6: - case 10: - case 11: - case 14: - case 15: - case 18: - case 19: - case 22: - case 23: - case 26: - case 27: - case 30: - case 31: - readWriteEnds.get("MC_EN").feedSignals(ZERO); - readWriteEnds.get("MC_MUX").feedSignals(X, X); - break; - case 2: - case 8: - case 9: - readWriteEnds.get("MC_EN").feedSignals(ONE); - readWriteEnds.get("MC_MUX").feedSignals(ZERO, ZERO); - break; - case 7: - case 12: - case 13: - readWriteEnds.get("MC_EN").feedSignals(ONE); - readWriteEnds.get("MC_MUX").feedSignals(ZERO, ONE); - break; - case 16: - case 17: - case 20: - case 21: - case 24: - case 25: - case 28: - case 29: - readWriteEnds.get("MC_EN").feedSignals(ONE); - readWriteEnds.get("MC_MUX").feedSignals(ONE, X); - break; - default: - throw new IllegalStateException("can't happen"); - } - return null; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(ModelAm2904ShiftInstrDecode.class.getCanonicalName(), - (m, p, n) -> new ModelAm2904ShiftInstrDecode(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java deleted file mode 100644 index a96b6795..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java +++ /dev/null @@ -1,267 +0,0 @@ -package net.mograsim.logic.model.am2900.components.am2910; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponent -{ - public ModelAm2910InstrPLA(LogicModelModifiable model, String name) - { - super(model, "Am2910InstrPLA", name, "Instr.\nPLA", false); - setSize(30, 85); - addPin(new Pin(model, this, "PASS", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "I", 4, PinUsage.INPUT, 0, 20), Position.RIGHT); - addPin(new Pin(model, this, "R=0", 1, PinUsage.INPUT, 15, 0), Position.BOTTOM); - addPin(new Pin(model, this, "_PL", 1, PinUsage.OUTPUT, 5, 85), Position.TOP); - addPin(new Pin(model, this, "_MAP", 1, PinUsage.OUTPUT, 15, 85), Position.TOP); - addPin(new Pin(model, this, "_VECT", 1, PinUsage.OUTPUT, 25, 85), Position.TOP); - addPin(new Pin(model, this, "RWE", 1, PinUsage.OUTPUT, 30, 5), Position.LEFT); - addPin(new Pin(model, this, "RDEC", 1, PinUsage.OUTPUT, 30, 15), Position.LEFT); - addPin(new Pin(model, this, "YD", 1, PinUsage.OUTPUT, 30, 25), Position.LEFT); - addPin(new Pin(model, this, "YR", 1, PinUsage.OUTPUT, 30, 35), Position.LEFT); - addPin(new Pin(model, this, "YF", 1, PinUsage.OUTPUT, 30, 45), Position.LEFT); - addPin(new Pin(model, this, "YmuPC", 1, PinUsage.OUTPUT, 30, 55), Position.LEFT); - addPin(new Pin(model, this, "STKI0", 1, PinUsage.OUTPUT, 30, 65), Position.LEFT); - addPin(new Pin(model, this, "STKI1", 1, PinUsage.OUTPUT, 30, 75), Position.LEFT); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - ReadEnd PASS = readEnds.get("PASS"); - ReadEnd I = readEnds.get("I"); - ReadEnd Req0 = readEnds.get("R=0"); - ReadWriteEnd _PL = readWriteEnds.get("_PL"); - ReadWriteEnd _MAP = readWriteEnds.get("_MAP"); - ReadWriteEnd _VECT = readWriteEnds.get("_VECT"); - ReadWriteEnd RWE = readWriteEnds.get("RWE"); - ReadWriteEnd RDEC = readWriteEnds.get("RDEC"); - ReadWriteEnd YD = readWriteEnds.get("YD"); - ReadWriteEnd YR = readWriteEnds.get("YR"); - ReadWriteEnd YF = readWriteEnds.get("YF"); - ReadWriteEnd YmuPC = readWriteEnds.get("YmuPC"); - ReadWriteEnd STKI0 = readWriteEnds.get("STKI0"); - ReadWriteEnd STKI1 = readWriteEnds.get("STKI1"); - - Bit PASSVal = PASS.getValue(); - Bit I3Val = I.getValue(3); - Bit I2Val = I.getValue(2); - Bit I1Val = I.getValue(1); - Bit I0Val = I.getValue(0); - Bit Req0Val = Req0.getValue(); - - if (!I3Val.isBinary() || !I2Val.isBinary() || !I1Val.isBinary() || !I0Val.isBinary()) - if ((I3Val == U || I3Val.isBinary()) || (I2Val == U || I2Val.isBinary()) || (I1Val == U || I1Val.isBinary()) - || (I0Val == U || I0Val.isBinary())) - { - _PL.feedSignals(U); - _MAP.feedSignals(U); - _VECT.feedSignals(U); - RWE.feedSignals(U); - RDEC.feedSignals(U); - YD.feedSignals(U); - YR.feedSignals(U); - YF.feedSignals(U); - YmuPC.feedSignals(U); - STKI0.feedSignals(U); - STKI1.feedSignals(U); - } else - { - _PL.feedSignals(X); - _MAP.feedSignals(X); - _VECT.feedSignals(X); - RWE.feedSignals(X); - RDEC.feedSignals(X); - YD.feedSignals(X); - YR.feedSignals(X); - YF.feedSignals(X); - YmuPC.feedSignals(X); - STKI0.feedSignals(X); - STKI1.feedSignals(X); - } - else - { - int IAsInt = (I3Val == ONE ? 8 : 0) + (I2Val == ONE ? 4 : 0) + (I1Val == ONE ? 2 : 0) + (I0Val == ONE ? 1 : 0); - Bit _PLVal = ONE; - Bit _MAPVal = ONE; - Bit _VECTVal = ONE; - if (IAsInt == 2) - _MAPVal = ZERO; - else if (IAsInt == 6) - _VECTVal = ZERO; - else - _PLVal = ZERO; - _PL.feedSignals(_PLVal); - _MAP.feedSignals(_MAPVal); - _VECT.feedSignals(_VECTVal); - if (IAsInt == 8 || IAsInt == 9 || IAsInt == 15) - { - RWE.feedSignals(Req0Val); - RDEC.feedSignals(Req0Val);// "forward" X/U/Z - } else if (IAsInt == 4) - { - RWE.feedSignals(PASSVal); - RDEC.feedSignals(PASSVal == ONE ? ZERO : PASSVal);// "forward" X/U/Z - } else - { - RWE.feedSignals(ZERO); - RDEC.feedSignals(ZERO); - } - if (!PASSVal.isBinary()) - { - YD.feedSignals(PASSVal);// "forward" X/U/Z - YR.feedSignals(PASSVal);// "forward" X/U/Z - YF.feedSignals(PASSVal);// "forward" X/U/Z - YmuPC.feedSignals(PASSVal);// "forward" X/U/Z - } else - { - Bit YDVal = ZERO; - Bit YRVal = ZERO; - Bit YFVal = ZERO; - Bit YmuPCVal = ZERO; - switch (IAsInt + (PASSVal == ONE ? 16 : 0)) - { - case 0: - case 0 + 16: - break; - case 2: - case 1 + 16: - case 2 + 16: - case 3 + 16: - case 5 + 16: - case 6 + 16: - case 7 + 16: - case 11 + 16: - YDVal = ONE; - break; - case 5: - case 7: - YRVal = ONE; - break; - case 13: - case 10 + 16: - YFVal = ONE; - break; - case 1: - case 3: - case 4: - case 6: - case 10: - case 11: - case 12: - case 14: - case 4 + 16: - case 12 + 16: - case 13 + 16: - case 14 + 16: - case 15 + 16: - YmuPCVal = ONE; - break; - case 8: - case 8 + 16: - YFVal = Req0Val.not();// "forward" X/U/Z - YmuPCVal = Req0Val;// "forward" X/U/Z - break; - case 9: - case 9 + 16: - YDVal = Req0Val.not();// "forward" X/U/Z - YmuPCVal = Req0Val;// "forward" X/U/Z - break; - case 15: - YFVal = Req0Val.not();// "forward" X/U/Z - YDVal = Req0Val;// "forward" X/U/Z - break; - default: - throw new IllegalStateException("shouldn't happen"); - } - YD.feedSignals(YDVal); - YR.feedSignals(YRVal); - YF.feedSignals(YFVal); - YmuPC.feedSignals(YmuPCVal); - Bit STKI0Val; - Bit STKI1Val; - switch (IAsInt + (PASSVal == ONE ? 16 : 0)) - { - case 1: - case 2: - case 3: - case 6: - case 7: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 2 + 16: - case 3 + 16: - case 6 + 16: - case 7 + 16: - case 9 + 16: - case 12 + 16: - case 14 + 16: - // HOLD - STKI1Val = ZERO; - STKI0Val = ZERO; - break; - case 4: - case 5: - case 1 + 16: - case 4 + 16: - case 5 + 16: - // PUSH - STKI1Val = ZERO; - STKI0Val = ONE; - break; - case 0: - case 0 + 16: - // CLEAR - STKI1Val = ONE; - STKI0Val = ZERO; - break; - case 10 + 16: - case 11 + 16: - case 13 + 16: - case 15 + 16: - // POP - STKI1Val = ONE; - STKI0Val = ONE; - break; - case 8: - case 15: - case 8 + 16: - STKI1Val = Req0Val;// "forward" X/U/Z - STKI0Val = Req0Val;// "forward" X/U/Z - break; - default: - throw new IllegalStateException("shouldn't happen"); - } - STKI0.feedSignals(STKI0Val); - STKI1.feedSignals(STKI1Val); - } - } - return null; - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(ModelAm2910InstrPLA.class.getCanonicalName(), - (m, p, n) -> new ModelAm2910InstrPLA(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java deleted file mode 100644 index 0c101bb4..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.mograsim.logic.model.am2900.components.am2910; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Arrays; -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class ModelAm2910RegCntr extends SimpleRectangularHardcodedModelComponent -{ - public ModelAm2910RegCntr(LogicModelModifiable model, String name) - { - super(model, "Am2910RegCntr", name, "Register/\nCounter", false); - setSize(40, 40); - addPin(new Pin(model, this, "D", 12, PinUsage.INPUT, 20, 0), Position.BOTTOM); - addPin(new Pin(model, this, "_RLD", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "WE", 1, PinUsage.INPUT, 0, 20), Position.RIGHT); - addPin(new Pin(model, this, "DEC", 1, PinUsage.INPUT, 0, 30), Position.RIGHT); - addPin(new Pin(model, this, "C", 1, PinUsage.INPUT, 40, 20), Position.LEFT); - addPin(new Pin(model, this, "Y", 12, PinUsage.OUTPUT, 20, 40), Position.TOP); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - Bit[] QC = (Bit[]) lastState; - if (QC == null) - { - QC = new Bit[13]; - Arrays.fill(QC, U); - } - - ReadEnd D = readEnds.get("D"); - ReadEnd _RLD = readEnds.get("_RLD"); - ReadEnd WE = readEnds.get("WE"); - ReadEnd DEC = readEnds.get("DEC"); - ReadEnd C = readEnds.get("C"); - ReadWriteEnd Y = readWriteEnds.get("Y"); - - Bit oldCVal = QC[12]; - Bit CVal = C.getValue(); - - // TODO handle U/X/Z - if (oldCVal == ZERO && CVal == ONE) - { - if ((DEC.getValue() == ZERO && WE.getValue() == ONE) || _RLD.getValue() == ZERO) - System.arraycopy(D.getValues().getBits(), 0, QC, 0, 12); - else if (WE.getValue() == ONE) - { - Bit carry = Bit.ZERO; - // TODO extract to helper. This code almost also exists in Modelinc. - for (int i = 11; i >= 0; i--) - { - Bit a = QC[i]; - QC[i] = a.xnor(carry); - carry = a.or(carry); - } - } - } - QC[12] = CVal; - Y.feedSignals(Arrays.copyOfRange(QC, 0, 12)); - - return QC; - } - - @Override - protected Object getHighLevelState(Object state, String stateID) - { - switch (stateID) - { - case "q": - return BitVector.of(Arrays.copyOfRange((Bit[]) state, 0, 12)); - default: - return super.getHighLevelState(state, stateID); - } - } - - @Override - protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) - { - switch (stateID) - { - case "q": - BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; - if (newHighLevelStateCasted.length() != 12) - throw new IllegalArgumentException("Expected BitVector of length 12, not " + newHighLevelStateCasted.length()); - System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 0, 12); - return lastState; - default: - return super.setHighLevelState(lastState, stateID, newHighLevelState); - } - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(ModelAm2910RegCntr.class.getCanonicalName(), - (m, p, n) -> new ModelAm2910RegCntr(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java deleted file mode 100644 index a99fe0d5..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java +++ /dev/null @@ -1,134 +0,0 @@ -package net.mograsim.logic.model.am2900.components.am2910; - -import static net.mograsim.logic.core.types.Bit.ONE; -import static net.mograsim.logic.core.types.Bit.U; -import static net.mograsim.logic.core.types.Bit.X; -import static net.mograsim.logic.core.types.Bit.ZERO; - -import java.util.Map; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public class ModelAm2910SP extends SimpleRectangularHardcodedModelComponent -{ - public ModelAm2910SP(LogicModelModifiable model, String name) - { - super(model, "Am2910SP", name, "Stack\npointer", false); - setSize(40, 30); - addPin(new Pin(model, this, "STKI0", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); - addPin(new Pin(model, this, "STKI1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); - addPin(new Pin(model, this, "C", 1, PinUsage.INPUT, 0, 25), Position.RIGHT); - addPin(new Pin(model, this, "A", 3, PinUsage.OUTPUT, 10, 30), Position.TOP); - addPin(new Pin(model, this, "B", 3, PinUsage.OUTPUT, 30, 30), Position.TOP); - addPin(new Pin(model, this, "_FULL", 1, PinUsage.OUTPUT, 40, 15), Position.LEFT); - - init(); - } - - @Override - public Object recalculate(Object lastState, Map readEnds, Map readWriteEnds) - { - BitAndInt SPC = (BitAndInt) lastState; - if (SPC == null) - { - SPC = new BitAndInt(); - SPC.bit = U; - SPC.i = -2; - } - int SP = SPC.i; - - Bit STKI0Val = readEnds.get("STKI0").getValue(); - Bit STKI1Val = readEnds.get("STKI1").getValue(); - Bit CVal = readEnds.get("C").getValue(); - if (SPC.bit == ZERO && CVal == ONE) - if (STKI0Val == U && STKI1Val == U) - SP = -2; - else if (!STKI0Val.isBinary() || !STKI1Val.isBinary()) - SP = -1; - else if (STKI0Val == ONE && STKI1Val == ZERO) - { - // PUSH - if (SP >= 0) - SP = SP == 5 ? 5 : SP + 1; - } else if (STKI0Val == ZERO && STKI1Val == ONE) - // CLEAR - SP = 0; - else if (STKI0Val == ONE && STKI1Val == ONE) - // POP - SP = SP <= 0 ? SP : SP - 1; - readWriteEnds.get("A").feedSignals(getAsBitVector(SP == 0 ? 7 : SP < 0 ? SP : SP - 1)); - readWriteEnds.get("B").feedSignals(getAsBitVector(SP == 5 ? 4 : SP)); - readWriteEnds.get("_FULL").feedSignals(SP == -2 ? U : SP == -1 ? X : SP == 5 ? ZERO : ONE); - - SPC.i = SP; - SPC.bit = CVal; - return SPC; - } - - @Override - protected Object getHighLevelState(Object state, String stateID) - { - switch (stateID) - { - case "q": - return getAsBitVector(((BitAndInt) state).i); - default: - return super.getHighLevelState(state, stateID); - } - } - - @Override - protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState) - { - switch (stateID) - { - case "q": - int i; - BitVector newHighLevelStateCasted = (BitVector) newHighLevelState; - if (newHighLevelStateCasted.length() != 3) - throw new IllegalArgumentException("Expected BitVector of length 3, not " + newHighLevelStateCasted.length()); - if (newHighLevelStateCasted.isBinary()) - i = newHighLevelStateCasted.getUnsignedValue().intValue(); - else - i = -1;// this makes setting to U impossible - if (i > 5) - throw new IllegalArgumentException("Given value not in range (0-5 incl.): " + i); - ((BitAndInt) lastState).i = i; - return lastState; - default: - return super.setHighLevelState(lastState, stateID, newHighLevelState); - } - } - - private static class BitAndInt - { - Bit bit; - int i; - } - - /** - * -1 means X, -2 means U - */ - private static BitVector getAsBitVector(int i) - { - if (i == -1) - return BitVector.of(X, 3); - if (i == -2) - return BitVector.of(U, 3); - return BitVector.of((i & 0b100) > 0 ? ONE : ZERO, (i & 0b10) > 0 ? ONE : ZERO, (i & 0b1) > 0 ? ONE : ZERO); - } - - static - { - IndirectModelComponentCreator.setComponentSupplier(ModelAm2910SP.class.getCanonicalName(), (m, p, n) -> new ModelAm2910SP(m, n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java deleted file mode 100644 index 0a0787cc..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java +++ /dev/null @@ -1,104 +0,0 @@ -package net.mograsim.logic.model.am2900.machine; - -import net.mograsim.logic.core.components.CoreClock; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.components.ModelAm2900MainMemory; -import net.mograsim.logic.model.am2900.components.ModelAm2900MicroInstructionMemory; -import net.mograsim.logic.model.model.LogicModel; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.CoreModelParameters; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.machine.Machine; -import net.mograsim.machine.MachineDefinition; -import net.mograsim.machine.MainMemory; -import net.mograsim.machine.Register; -import net.mograsim.machine.mi.MicroInstructionMemory; -import net.mograsim.machine.mi.StandardMicroInstructionMemory; -import net.mograsim.machine.standard.memory.WordAddressableMemory; - -public class Am2900Machine implements Machine -{ - private Am2900MachineDefinition machineDefinition; - private LogicModelModifiable logicModel; - private Timeline timeline; - private MainMemory mainMemory; - private MicroInstructionMemory instMemory; - private CoreClock clock; - - public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition) - { - this.machineDefinition = am2900MachineDefinition; - logicModel = new LogicModelModifiable(); - IndirectModelComponentCreator.createComponent(logicModel, - "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900"); - CoreModelParameters params = new CoreModelParameters(); - params.gateProcessTime = 50; - params.wireTravelTime = 10; - mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()); - instMemory = new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()); - logicModel.getComponentBySubmodelPath("Am2900.Am2900MainMemory#0", ModelAm2900MainMemory.class).setMachine(this); - logicModel.getComponentBySubmodelPath("Am2900.Am2900MicroInstructionMemory#0", ModelAm2900MicroInstructionMemory.class) - .setMachine(this); - timeline = LogicCoreAdapter.convert(logicModel, params); - } - - @Override - public MachineDefinition getDefinition() - { - return machineDefinition; - } - - @Override - public void reset() - { - // TODO Auto-generated method stub - - } - - @Override - public LogicModel getModel() - { - return logicModel; - } - - @Override - public Timeline getTimeline() - { - return timeline; - } - - @Override - public CoreClock getClock() - { - return clock; - } - - @Override - public BitVector getRegister(Register r) - { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setRegister(Register r, BitVector value) - { - // TODO Auto-generated method stub - - } - - @Override - public MainMemory getMainMemory() - { - return mainMemory; - } - - @Override - public MicroInstructionMemory getMicroInstructionMemory() - { - return instMemory; - } - -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java deleted file mode 100644 index 0ac06ea7..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MachineDefinition.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.mograsim.logic.model.am2900.machine; - -import java.util.Objects; -import java.util.Set; - -import net.mograsim.machine.ISASchema; -import net.mograsim.machine.Machine; -import net.mograsim.machine.MachineDefinition; -import net.mograsim.machine.MachineRegistry; -import net.mograsim.machine.MainMemoryDefinition; -import net.mograsim.machine.Register; -import net.mograsim.machine.mi.MicroInstructionMemoryDefinition; - -public class Am2900MachineDefinition implements MachineDefinition -{ - private MainMemoryDefinition memoryDefinition = new Am2900MainMemoryDefinition(); - private MicroInstructionMemoryDefinition microInstMemoryDefinition = new Am2900MicroInstructionMemoryDefinition(); - private final static Am2900MachineDefinition instance = new Am2900MachineDefinition(); - - public static Am2900MachineDefinition getInstance() - { - return Objects.requireNonNullElseGet((Am2900MachineDefinition) MachineRegistry.getinstalledMachines().get("Am2900"), - () -> instance); - } - - @Override - public Machine createNew() - { - return new Am2900Machine(this); - } - - @Override - public ISASchema getISASchema() - { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set getRegisters() - { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getAddressBits() - { - return 16; - } - - @Override - public MainMemoryDefinition getMainMemoryDefinition() - { - return memoryDefinition; - } - - @Override - public MicroInstructionMemoryDefinition getMicroInstructionMemoryDefinition() - { - return microInstMemoryDefinition; - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MainMemoryDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MainMemoryDefinition.java deleted file mode 100644 index 478ec242..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MainMemoryDefinition.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.mograsim.logic.model.am2900.machine; - -import net.mograsim.machine.MainMemoryDefinition; - -public class Am2900MainMemoryDefinition implements MainMemoryDefinition -{ - - @Override - public int getMemoryAddressBits() - { - return 16; - } - - @Override - public long getMinimalAddress() - { - return 0; - } - - @Override - public long getMaximalAddress() - { - return 0xFFFF; - } - - @Override - public int getCellWidth() - { - return 16; - } - -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java deleted file mode 100644 index 3657bed9..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionDefinition.java +++ /dev/null @@ -1,112 +0,0 @@ -package net.mograsim.logic.model.am2900.machine; - -import java.util.Arrays; -import java.util.Optional; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.machine.mi.MicroInstructionDefinition; -import net.mograsim.machine.mi.parameters.BooleanClassification; -import net.mograsim.machine.mi.parameters.IntegerClassification; -import net.mograsim.machine.mi.parameters.MnemonicFamily; -import net.mograsim.machine.mi.parameters.MnemonicFamily.MnemonicPair; -import net.mograsim.machine.mi.parameters.ParameterClassification; - -public class Am2900MicroInstructionDefinition implements MicroInstructionDefinition -{ - private static final BooleanClassification interruptEnable = new BooleanClassification(false, "IE", "Dis"); - // not implemented, because not documented. - private static final MnemonicFamily interruptInstructions = new MnemonicFamily("X", new MnemonicPair("X", BitVector.of(Bit.ZERO, 4))); - private static final BooleanClassification kmux = new BooleanClassification(false, "D", "K"); - private static final MnemonicFamily am2901SrcInstructions = new MnemonicFamily("AB", "AQ", "AB", "ZQ", "ZB", "ZA", "DA", "DQ", "DZ"); - private static final MnemonicFamily am2901FuncInstructions = new MnemonicFamily("ADD", "ADD", "SUBR", "SUBS", "OR", "AND", "NOTRS", - "EXOR", "EXNOR"); - private static final MnemonicFamily am2901DestInstructions = new MnemonicFamily("NOP", "QREG", "NOP", "RAMA", "RAMF", "RAMQD", "RAMD", - "RAMQU", "RAMU"); - private static final IntegerClassification register = new IntegerClassification(0, 4); - private static final BooleanClassification registerSelect = new BooleanClassification(false, "MR", "IR"); - private static final BooleanClassification abus = new BooleanClassification(true, "H", "AB"); - private static final BooleanClassification dbus = new BooleanClassification(true, "H", "DB"); - private static final MnemonicFamily am2904CarryInstructions = new MnemonicFamily("CI0", "CI0", "CI1", "CIX", "CIC"); - private static final MnemonicFamily am2904ShiftInstructions = new MnemonicFamily("RSL / LSLCO", "RSL / LSLCO", "RSH / LSHCO", - "RSCONI / LSL", "RSDH / LSH", "RSDC / LSDLCO", "RSDN / LSDHCO", "RSDL / LSDL", "RSDCO / LSDH", "RSRCO / LSCRO", - "RSRCIO / LSCRIO", "RSR / LSR", "RSDIC / LSLICI", "RSDRCI / LSDCIO", "RSDRCO / LSDRCO", "RSDXOR / LSDCI", "RSDR / LDSR"); -// private static final MnemonicFamily am2904StatusInstructions = new MnemonicFamily( -// new String[] { "MI_Zero", "MI_NotZero", "MI_UGTEQ", "MI_ULT", "MI_UGT", "MI_ULTEQ", "MI_SGTEQ", "MI_SLT", "MI_SGT", "MI_SLTEQ", -// "MA_Zero", "MA_NotZero", "MA_UGTEQ", "MA_ULT", "MA_UGT", "MA_ULTEQ", "MA_SGTEQ", "MA_SLT", "MA_SGT", "MA_SLTEQ" }, -// new long[] { 0b01_0101, 0b01_0100, 0b01_1101, 0b01_1100, 0b01_1110, 0b01_1111, 0b01_0010, 0b01_0011, 0b01_0000, 0b01_0001, -// 0b10_0101, 0b10_0100, 0b10_1101, 0b10_1100, 0b10_1110, 0b10_1111, 0b10_0010, 0b10_0011, 0b10_0000, 0b10_0001 }, -// 6); - // TODO: Maybe "X" and "notX" are swapped. - private static final MnemonicFamily am2904StatusInstructions = new MnemonicFamily("Load_Load_I_Z", "LoadM_LoadY_Âµ_NxorOVRorZ", - "Set_Set_Âµ_NxnorOVRornotZ", "Swap_Swap_Âµ_NxorOVR", "Reset_Reset_Âµ_NxnorOVR", "Load_LoadForShiftThroughOvr_Âµ_Z", - "Load_Invert_Âµ_notZ", "LoadOvrRetain_Load_Âµ_OVR", "LoadOvrRetain_Load_Âµ_notOVR", "ResetZ_LoadCarryInvert_Âµ_CorZ", - "SetZ_LoadCarryInvert_Âµ_notCandnotZ", "ResetC_Load_Âµ_C", "SetC_Load_Âµ_notC", "ResetN_Load_Âµ_notCorZ", "SetN_Load_Âµ_CandnotZ", - "ResetOvr_Load_IM_NxorN", "SetOvr_Load_IM_NxnorN", "Load_Load_Âµ_NxorOVRorZ", "Load_Load_Âµ_NxnorOVRornotZ", - "Load_Load_Âµ_NxorOVR", "Load_Load_Âµ_NxnorOVR", "Load_Load_Âµ_Z", "Load_Load_Âµ_notZ", "Load_Load_Âµ_OVR", "Load_Load_Âµ_notOVR", - "LoadCarryInvert_LoadCarryInvert_Âµ_CorZ", "LoadCarryInvert_LoadCarryInvert_Âµ_notCandnotZ", "Load_Load_Âµ_C", "Load_Load_Âµ_notC", - "Load_Load_Âµ_notCorZ", "Load_Load_Âµ_CandnotZ", "Load_Load_Âµ_N", "Load_Load_Âµ_notN", "Load_Load_M_NxorOVRorZ", - "Load_Load_M_NxnorOVRornotZ", "Load_Load_M_NxorOVR", "Load_Load_M_NxnorOVR", "Load_Load_M_Z", "Load_Load_M_notZ", - "Load_Load_M_OVR", "Load_Load_M_notOVR", "LoadCarryInvert_LoadCarryInvert_M_CorZ", - "LoadCarryInvert_LoadCarryInvert_M_notCandnotZ", "Load_Load_M_C", "Load_Load_M_notC", "Load_Load_M_notCorZ", - "Load_Load_M_CandnotZ", "Load_Load_M_N", "Load_Load_M_notN", "Load_Load_I_NxorOVRorZ", "Load_Load_I_NxnorOVRornotZ", - "Load_Load_I_NxorOVR", "Load_Load_I_NxnorOVR", "Load_Load_I_Z", "Load_Load_I_notZ", "Load_Load_I_OVR", "Load_Load_I_notOVR", - "LoadCarryInvert_LoadCarryInvert_I_notCorZ", "LoadCarryInvert_LoadCarryInvert_I_CandnotZ", "Load_Load_I_C", "Load_Load_I_notC", - "Load_Load_I_notCorZ", "Load_Load_I_CandnotZ", "Load_Load_I_N", "Load_Load_I_notN"); - private static final BooleanClassification ccen = new BooleanClassification(true, "PS", "C"); - private static final MnemonicFamily am2910Instructions = new MnemonicFamily("CONT", "JZ", "CJS", "JMAP", "CJP", "PUSH", "JSRP", "CJV", - "JRP", "RFCT", "RPCT", "CRTN", "CJPP", "LDCT", "LOOP", "CONT", "TWB"); - - private static final IntegerClassification constant_12bit = new IntegerClassification(0, 12); - private static final IntegerClassification constant_16bit = new IntegerClassification(0, 16); - private static final BooleanClassification hE = new BooleanClassification(true, "H", "E"); - private static final BooleanClassification hI = new BooleanClassification(true, "H", "I"); - private static final BooleanClassification hL = new BooleanClassification(true, "H", "L"); - private static final BooleanClassification rW = new BooleanClassification(true, "R", "W"); - - private static final ParameterClassification[] classes = { interruptEnable, interruptInstructions, kmux, constant_16bit, - am2901SrcInstructions, am2901FuncInstructions, am2901DestInstructions, register, registerSelect, register, registerSelect, abus, - dbus, am2904CarryInstructions, am2904ShiftInstructions, hL, hL, am2904StatusInstructions, ccen, am2910Instructions, - constant_12bit, hL, hE, hI, hE, hL, rW }; - - private static final String[] paramDesc = { "Allow interrupts?", "Interrupt instructions; omitted for simplicity", - "Get D-input from data bus/constant value", "Constant value", "Operand sources for ALU operation", "ALU operation", - "Destination of ALU calculation", "Register for A-operand", "Get A-operand from instruction register/micro instruction?", - "Register for B-operand", "Get B-operand from instruction register/micro instruction?", - "Put data from Y-output on address bus?", "Put data from Y-output on data bus?", "Source for carry-in", "Shift instructions", - "Modify micro status register?", "Modify macro status register?", "Operations on the status register", - "Is conditional jump enabled?", "Instructions for the micro instruction pointer", "Absolute address of a micro instruction", - "Load instruction pointer from data bus?", "Put instruction pointer on data bus?", "Increment instruction pointer?", - "Put instruction pointer on address bus?", "Load instruction register from data bus?", "Read from/Write to main memory?" }; - - @Override - public ParameterClassification[] getParameterClassifications() - { - return classes; - } - - @Override - public ParameterClassification getParameterClassification(int index) - { - return classes[index]; - } - - @Override - public Optional getParameterDescription(int index) - { - return Optional.of(paramDesc[index]); - } - - public static void main(String[] args) - { - String s = "new BooleanClassification(\"R\", \"W\"), hL, new BooleanClassification(\"H\", \"E\"),\r\n" - + " new BooleanClassification(\"H\", \"I\"), new BooleanClassification(\"H\", \"E\"), hL, new IntegerClassification(12), am2910Instructions,\r\n" - + " new BooleanClassification(\"PS\", \"C\"), am2904StatusInstructions, hL, hL, am2904ShiftInstructions, am2904CarryInstructions,\r\n" - + " new BooleanClassification(\"H\", \"DB\"), new BooleanClassification(\"H\", \"AB\"), registerSelect, register, registerSelect, register,\r\n" - + " am2901DestInstructions, am2901FuncInstructions, am2901SrcInstructions, new IntegerClassification(16),\r\n" - + " new BooleanClassification(\"D\", \"K\"), interruptInstructions, new BooleanClassification(\"Dis\", \"IE\")"; - s = s.replaceAll("[\r\n\t]", ""); - System.out.print(Arrays.stream(s.split(", new")).reduce((a, b) -> b + ", new" + a)); -// System.out.println(Arrays.stream(paramDesc).reduce("", (a, b) -> String.format("\"%s\", %s", b, a))); - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionMemoryDefinition.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionMemoryDefinition.java deleted file mode 100644 index 01b83212..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900MicroInstructionMemoryDefinition.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.mograsim.logic.model.am2900.machine; - -import net.mograsim.machine.mi.MicroInstructionDefinition; -import net.mograsim.machine.mi.MicroInstructionMemoryDefinition; - -public class Am2900MicroInstructionMemoryDefinition implements MicroInstructionMemoryDefinition -{ - - @Override - public int getMemoryAddressBits() - { - return 12; - } - - @Override - public long getMinimalAddress() - { - return 0; - } - - @Override - public long getMaximalAddress() - { - return 4096; - } - - @Override - public MicroInstructionDefinition getMicroInstructionDefinition() - { - return new Am2900MicroInstructionDefinition(); - } -} diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json deleted file mode 100644 index b753895c..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "version": "0.1.0", - "map": { - "Am2900MainMemory": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.ModelAm2900MainMemory", - "Am2900MicroInstructionMemory": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.ModelAm2900MicroInstructionMemory", - "Am2904RegCTInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.ModelAm2904RegCTInstrDecode", - "Am2904ShiftInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.ModelAm2904ShiftInstrDecode", - "Am2910InstrPLA": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910InstrPLA", - "Am2910RegCntr": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910RegCntr", - "Am2910SP": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910SP", - "dff12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modeldff12", - "dff4_finewe": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modeldff4_finewe", - "inc": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelinc", - "nor12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelnor12", - "ram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelram5_12", - "sel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelsel4_12", - "Am2900": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", - "Am2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901.json", - "Am2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json", - "Am2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json", - "Am2901ALUInclSourceDecodeInclFunctionDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json", - "Am2901ALUOneBit": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json", - "Am2904": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904.json", - "Am2910": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2910/Am2910.json", - "Am2904MSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json", - "Am2904muSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json", - "Am2904TestLogic": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json", - "Am2901DestDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json", - "Am2901SourceDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json", - "_rsLatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/_rsLatch.json", - "and": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/and.json", - "and41": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/and41.json", - "andor414": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/andor414.json", - "demux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/demux2.json", - "dff": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff.json", - "dff4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4.json", - "dff4_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4_invwe.json", - "dff8": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff8.json", - "dff12_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff12_we.json", - "dff16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16.json", - "dff16_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_we.json", - "dff16_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json", - "dff80": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff80.json", - "dlatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch.json", - "dlatch4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch4.json", - "dlatch8": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch8.json", - "dlatch80": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch80.json", - "fulladder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/fulladder.json", - "halfadder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/halfadder.json", - "mux1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1.json", - "mux1_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_4.json", - "mux1_8": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_8.json", - "mux1_12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_12.json", - "mux1_16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_16.json", - "mux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2.json", - "mux3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux3.json", - "nand3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/nand3.json", - "not4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/not4.json", - "or4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/or4.json", - "or_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/or_4.json", - "ram2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ram2.json", - "ram4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ram4.json", - "sel1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel1.json", - "sel2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel2_4.json", - "sel3_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel3_4.json", - "xor": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/xor.json" - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GenerateDff80HighLevelStateHandler.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GenerateDff80HighLevelStateHandler.java deleted file mode 100644 index 7a161348..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GenerateDff80HighLevelStateHandler.java +++ /dev/null @@ -1,74 +0,0 @@ -package net.mograsim.logic.model.examples; - -import java.util.ArrayList; - -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler.BitVectorSplittingAtomicHighLevelStateHandlerParams; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler.DelegatingAtomicHighLevelStateHandlerParams; - -public class GenerateDff80HighLevelStateHandler -{ - public static void main(String[] args) - { - Am2900Loader.setup(); - LogicModelModifiable model = new LogicModelModifiable(); - DeserializedSubmodelComponent comp = new DeserializedSubmodelComponent(model, null, null, null); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#0");// LSB - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#1"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#2"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#3"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#4"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#5"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#6"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#7"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#8"); - IndirectModelComponentCreator.createComponent(comp.getSubmodelModifiable(), "dff8", "dff8#9");// MSB - - StandardHighLevelStateHandler hlsh = new StandardHighLevelStateHandler(comp); - comp.setHighLevelStateHandler(hlsh); - BitVectorSplittingAtomicHighLevelStateHandlerParams p = new BitVectorSplittingAtomicHighLevelStateHandlerParams(); - p.vectorPartLengthes = new ArrayList<>(); - p.vectorPartTargets = new ArrayList<>(); - for (int i = 0; i < 10; i++) - { - addHandlersForByte(comp, hlsh, i, p); - } - hlsh.addAtomicHighLevelState("q", new BitVectorSplittingAtomicHighLevelStateHandler(comp, p)); - - System.out.println(comp.getHighLevelStateHandler().getParamsForSerializingJSON(new IdentifyParams())); - } - - private static void addHandlersForByte(SubmodelComponent comp, StandardHighLevelStateHandler hlsh, int LSByteIndex, - BitVectorSplittingAtomicHighLevelStateHandlerParams p2) - { - // TODO remove the "+ 1" as soon as HighLevelStates count from 0 - // Also replace the 1 in "bitIndexInByte = 1" below with a 0 - int LSBitIndex = LSByteIndex * 8 + 1; - int MSBitIndex = LSBitIndex + 7; - String dffThisByte = "dff8#" + LSByteIndex; - String thisByteHLSID = "q" + MSBitIndex + "-" + LSBitIndex; - - p2.vectorPartLengthes.add(0, 8); - p2.vectorPartTargets.add(0, thisByteHLSID); - - DelegatingAtomicHighLevelStateHandlerParams p = new DelegatingAtomicHighLevelStateHandlerParams(); - p.delegateTarget = dffThisByte; - p.subStateID = "q"; - hlsh.addAtomicHighLevelState(thisByteHLSID, new DelegatingAtomicHighLevelStateHandler(comp, p)); - for (int bitIndexOuter = LSBitIndex, bitIndexInByte = 1; bitIndexOuter <= MSBitIndex; bitIndexOuter++, bitIndexInByte++) - { - p = new DelegatingAtomicHighLevelStateHandlerParams(); - p.delegateTarget = dffThisByte; - p.subStateID = "q" + bitIndexInByte; - hlsh.addAtomicHighLevelState("q" + bitIndexOuter, new DelegatingAtomicHighLevelStateHandler(comp, p)); - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java deleted file mode 100644 index 1e654c80..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java +++ /dev/null @@ -1,58 +0,0 @@ -package net.mograsim.logic.model.examples; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class ModelComponentTestbench -{ - public static void main(String[] args) - { - SimpleLogicUIStandalone.executeVisualisation(ModelComponentTestbench::createTestbench); - } - - @SuppressWarnings("unused") // for ModelWires being created - public static void createTestbench(LogicModelModifiable model) - { - Am2900Loader.setup(); - ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2900"); - - List inputPinNames = new ArrayList<>(); - List outputPinNames = new ArrayList<>(); - for (Pin p : comp.getPins().values()) - if (p.usage == PinUsage.INPUT) - inputPinNames.add(p.name); - else - outputPinNames.add(p.name); - - inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); - outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); - - comp.moveTo(100, 0); - for (int i = 0; i < inputPinNames.size(); i++) - { - String pinName = inputPinNames.get(i); - ModelManualSwitch sw = new ModelManualSwitch(model, comp.getPin(pinName).logicWidth); - sw.moveTo(0, 20 * i); - new ModelWire(model, comp.getPin(pinName), sw.getOutputPin()); - } - for (int i = 0; i < outputPinNames.size(); i++) - { - String pinName = outputPinNames.get(i); - ModelBitDisplay bd = new ModelBitDisplay(model, comp.getPin(pinName).logicWidth); - bd.moveTo(200, 20 * i); - new ModelWire(model, comp.getPin(pinName), bd.getInputPin()); - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java deleted file mode 100644 index f34bf342..00000000 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeAndVerifyJSONs.java +++ /dev/null @@ -1,363 +0,0 @@ -package net.mograsim.logic.model.examples; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Scanner; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; -import net.mograsim.logic.model.model.wires.MovablePin; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler; - -public class ReserializeAndVerifyJSONs -{ - public static double GRIDSIZE = 2.5; - public static boolean changePinUsages = false; - public static boolean changeComponentNames = false; - public static boolean snapWCPs = true; - public static boolean warnNonSnappedPoints = true; - public static boolean warnNonVertHorizLines = true; - public static boolean warnRedundantWires = true; - - public static void main(String[] args) throws IOException - { - Am2900Loader.setup(); - try (Scanner sysin = new Scanner(System.in)) - { - System.out.print("Directory to search for JSONs in / JSON file to reserialize >"); - Path root = Paths.get(sysin.nextLine()); - if (!Files.exists(root)) - throw new IllegalArgumentException("Path doesn't exist"); - if (Files.isRegularFile(root)) - reserializeJSON(root, sysin); - else - { - System.out.print("Recursive? >"); - boolean recursive = Boolean.valueOf(sysin.nextLine()); - try (Stream jsons = recursive ? Files.walk(root) : Files.list(root)) - { - jsons.filter(Files::isRegularFile).filter(p -> p.getFileName().toString().endsWith(".json")) - .forEach(j -> reserializeJSON(j, sysin)); - } - } - } - } - - public static void reserializeJSON(Path componentPath, Scanner sysin) - { - try - { - DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator - .createComponent(new LogicModelModifiable(), "jsonfile:" + componentPath.toString()); - System.out.println("Reserializing " + componentPath); - LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable(); - Map componentNameRemapping = new HashMap<>(); - - if (changePinUsages) - changePinUsages(sysin, comp); - if (changeComponentNames) - changeComponentNames(sysin, submodelModifiable, componentNameRemapping); - if (snapWCPs) - snapWCPs(submodelModifiable); - if (warnNonSnappedPoints) - warnNonSnappedPoints(comp, submodelModifiable); - if (warnNonVertHorizLines) - warnNonVertHorizLines(submodelModifiable); - if (warnRedundantWires) - warnRedundantWires(submodelModifiable); - - SubmodelComponentSerializer.serialize(comp, componentPath.toString()); - - if (changeComponentNames) - changeComponentNames_AfterSerialization(sysin, comp, componentNameRemapping); - } - catch (Exception e) - { - System.err.println("An error occurred visiting " + componentPath + ":"); - e.printStackTrace(); - } - } - - private static void warnRedundantWires(LogicModelModifiable submodelModifiable) - { - Map> connectedPinGroups = new HashMap<>(); - submodelModifiable.getComponentsByName().values().stream().map(ModelComponent::getPins).map(Map::values).flatMap(Collection::stream) - .forEach(p -> connectedPinGroups.put(p, new HashSet<>(Arrays.asList(p)))); - submodelModifiable.getWiresByName().values().forEach(w -> - { - Pin pin1 = w.getPin1(); - Pin pin2 = w.getPin2(); - Set pin1Group = connectedPinGroups.get(pin1); - Set pin2Group = connectedPinGroups.get(pin2); - if (pin1Group == pin2Group) - System.out.println(" Wire " + w.name + " connecting " + pin1 + " and " + pin2 + " is redundant"); - else - { - pin1Group.addAll(pin2Group); - pin2Group.forEach(p -> connectedPinGroups.put(p, pin1Group)); - } - }); - } - - private static void changePinUsages(Scanner sysin, DeserializedSubmodelComponent comp) - { - comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin -> - { - PinUsage usage = null; - while (usage == null) - try - { - System.out.print(" Usage for interface pin " + pin.name + " (empty: " + pin.usage + ") >"); - String usageStr = sysin.nextLine().toUpperCase(); - usage = usageStr.equals("") ? pin.usage - : usageStr.equals("I") ? PinUsage.INPUT - : usageStr.equals("O") ? PinUsage.OUTPUT - : usageStr.equals("T") ? PinUsage.TRISTATE : PinUsage.valueOf(usageStr); - } - catch (@SuppressWarnings("unused") IllegalArgumentException e) - { - System.err.println(" Illegal usage"); - } - setInterfacePinUsage(comp, pin, usage); - }); - } - - private static void changeComponentNames(Scanner sysin, LogicModelModifiable submodelModifiable, - Map componentNameRemapping) - { - componentNameRemapping.put(SubmodelComponent.SUBMODEL_INTERFACE_NAME, SubmodelComponent.SUBMODEL_INTERFACE_NAME); - LogicModelModifiable tempModel = new LogicModelModifiable(); - IdentifyParams iP = new IdentifyParams(); - submodelModifiable.getComponentsByName().entrySet().stream() - .filter(e -> !e.getKey().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)) - .sorted(Comparator.comparing(Entry::getKey, ReserializeAndVerifyJSONs::compareStringsWithIntegers)).forEach(e -> - { - String oldName = e.getKey(); - ModelComponent subcomp = e.getValue(); - String defaultName = tempModel.getDefaultComponentName(subcomp); - String newName = null; - while (newName == null) - { - System.out.print(" New name for component " + oldName + " of type " + subcomp.getIDForSerializing(iP) + " (empty: " - + defaultName + ") >"); - newName = sysin.nextLine(); - if (newName.equals("")) - newName = defaultName; - if (tempModel.getComponentsByName().containsKey(newName)) - { - System.err.println(" There already is a component with that name"); - newName = null; - } - } - componentNameRemapping.put(oldName, newName); - IndirectModelComponentCreator - .createComponent(tempModel, subcomp.getIDForSerializing(iP), subcomp.getParamsForSerializingJSON(iP), newName) - .moveTo(subcomp.getPosX(), subcomp.getPosY()); - }); - SubmodelInterface tempSubmodelInterface = new SubmodelInterface(tempModel); - for (Pin p : submodelModifiable.getComponentsByName().get(SubmodelComponent.SUBMODEL_INTERFACE_NAME).getPins().values()) - tempSubmodelInterface - .addPin(new Pin(tempModel, tempSubmodelInterface, p.name, p.logicWidth, p.usage, p.getRelX(), p.getRelY())); - for (ModelWire w : submodelModifiable.getWiresByName().values()) - createWire(componentNameRemapping::get, tempModel, w); - - Optional o; - while ((o = submodelModifiable.getComponentsByName().values().stream() - .filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent()) - submodelModifiable.destroyComponent(o.get()); - - tempModel.getComponentsByName().values().stream().filter(c -> !c.getName().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)) - .forEach(c -> IndirectModelComponentCreator - .createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.getName()) - .moveTo(c.getPosX(), c.getPosY())); - for (ModelWire w : tempModel.getWiresByName().values()) - createWire(Function.identity(), submodelModifiable, w); - } - - private static void changeComponentNames_AfterSerialization(Scanner sysin, DeserializedSubmodelComponent comp, - Map componentNameRemapping) - { - if (comp.getHighLevelStateHandler() == null || !(comp.getHighLevelStateHandler() instanceof DefaultHighLevelStateHandler)) - { - System.out.println(" A non-default HighLevelStateHandler was detected. Check for changes there manually."); - System.out.print(" Empty line to continue to next component, old component name to get new component name >"); - for (String line = sysin.nextLine(); !line.equals(""); line = sysin.nextLine()) - System.out.println(" " + line + "->" + componentNameRemapping.get(line) + " >"); - } - } - - private static void snapWCPs(LogicModelModifiable submodelModifiable) - { - submodelModifiable.getComponentsByName().values().stream().filter(c -> c instanceof ModelWireCrossPoint).forEach(c -> - { - double x = c.getPosX(); - double y = c.getPosY(); - double newX = x % GRIDSIZE == 0 ? x - 1 : x; - double newY = y % GRIDSIZE == 0 ? y - 1 : y; - if (x != newX || y != newY) - { - c.moveTo(newX, newY); - System.out.println(" Snapping WCP " + c.getName()); - } - }); - } - - private static void warnNonSnappedPoints(DeserializedSubmodelComponent comp, LogicModelModifiable submodelModifiable) - { - if (comp.getWidth() % GRIDSIZE != 0 || comp.getHeight() % GRIDSIZE != 0) - System.out.println(" Size is not snapped to grid: " + comp.getWidth() + "," + comp.getHeight()); - submodelModifiable.getComponentsByName().values().forEach(c -> - { - double x = c.getPosX(); - double y = c.getPosY(); - if (c instanceof ModelWireCrossPoint) - { - x++; - y++; - } - if (x % GRIDSIZE != 0 || y % GRIDSIZE != 0) - System.out.println(" Component " + c.getName() + " (type " + c.getIDForSerializing(new IdentifyParams()) - + ") is not snapped to grid: " + x + "," + y); - }); - submodelModifiable.getWiresByName().values().forEach(w -> - { - Point[] p = w.getPath(); - if (p != null) - for (int i = 0; i < p.length; i++) - if (p[i].x % GRIDSIZE != 0 || p[i].y % GRIDSIZE != 0) - System.out.println(" Wire " + w.name + " path point #" + i + " is not snapped to grid: " + p[i].x + "," + p[i].y); - }); - comp.getPins().values().forEach(p -> - { - if (p.getRelX() % GRIDSIZE != 0 || p.getRelY() % GRIDSIZE != 0) - System.out.println(" Interface point " + p.name + " is not snapped to grid: " + p.getRelX() + "," + p.getRelY()); - }); - } - - private static void warnNonVertHorizLines(LogicModelModifiable submodelModifiable) - { - submodelModifiable.getWiresByName().values().forEach(w -> - { - double[] p = w.getEffectivePath(); - for (int i = 1; i < p.length / 2; i++) - { - double x1 = p[2 * i - 2]; - double y1 = p[2 * i - 1]; - double x2 = p[2 * i + 0]; - double y2 = p[2 * i + 1]; - if (x1 != x2 && y1 != y2) - System.out.println(" Wire " + w.name + " part #" + (i - 1) + " is neither vertical nor horizontal"); - } - }); - } - - private static ModelWire createWire(Function componentNameRemapping, LogicModelModifiable tempModelForDefaultNames, - ModelWire w) - { - return new ModelWire(tempModelForDefaultNames, w.name, - getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin1()), - getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin2()), w.getPath()); - } - - private static Pin getRemappedPin(Function componentNameRemapping, LogicModelModifiable tempModelForDefaultNames, - Pin pin) - { - return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.getName())).getPin(pin.name); - } - - private static int compareStringsWithIntegers(String a, String b) - { - int aLoc = 0; - int bLoc = 0; - for (;;) - { - if (aLoc == a.length()) - { - if (bLoc == b.length()) - return 0; - return -1; - } - if (bLoc == b.length()) - return 1; - int aInt = 0; - int aIntLen = 0; - char nextCharA; - for (;;) - { - nextCharA = a.charAt(aLoc++); - if (nextCharA < '0' || nextCharA > '9') - break; - aIntLen++; - aInt = aInt * 10 + nextCharA - '0'; - if (aLoc == a.length()) - break; - } - int bInt = 0; - int bIntLen = 0; - char nextCharB; - for (;;) - { - nextCharB = b.charAt(bLoc++); - if (nextCharB < '0' || nextCharB > '9') - break; - bIntLen++; - bInt = bInt * 10 + nextCharB - '0'; - if (bLoc == b.length()) - break; - } - if (aIntLen != 0) - { - if (bIntLen == 0) - return -1; - int comp = Integer.compare(aInt, bInt); - if (comp != 0) - return comp; - } else - { - if (bIntLen != 0) - return 1; - int comp = Character.compare(nextCharA, nextCharB); - if (comp != 0) - return comp; - } - } - } - - private static void setInterfacePinUsage(DeserializedSubmodelComponent comp, Pin interfacePin, PinUsage usage) - { - Set wiresConnectedToPin = comp.submodel.getWiresByName().values().stream() - .filter(w -> w.getPin1() == interfacePin || w.getPin2() == interfacePin).collect(Collectors.toSet()); - LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable(); - wiresConnectedToPin.forEach(submodelModifiable::destroyWire); - comp.removeSubmodelInterface(interfacePin.name); - comp.addSubmodelInterface(new MovablePin(submodelModifiable, comp, interfacePin.name, interfacePin.logicWidth, usage, - interfacePin.getRelX(), interfacePin.getRelY())); - wiresConnectedToPin.forEach(w -> new ModelWire(submodelModifiable, w.getPin1(), w.getPin2())); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/JavaJsonLineCounter.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/JavaJsonLineCounter.java deleted file mode 100644 index 2f6cd4e3..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/JavaJsonLineCounter.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.mograsim.logic.model; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.function.Function; -import java.util.stream.Stream; - -public class JavaJsonLineCounter -{ - public static void main(String[] args) throws IOException - { - printLineCount("..", "java"); - printLineCount("..", "json"); - } - - private static void printLineCount(String path, String filetype) throws IOException - { - long lineCount = Files.walk(Paths.get(path)).filter(Files::isRegularFile).filter(p -> p.toString().endsWith('.' + filetype)) - .flatMap((Function>) p -> - { - try - { - return Files.lines(p); - } - catch (IOException e) - { - throw new UncheckedIOException(e); - } - }).count(); - System.out.println("Total lines in " + filetype + " files: " + lineCount); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableCircuit.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableCircuit.java deleted file mode 100644 index d36d80ff..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/TestableCircuit.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mograsim.logic.model.am2900; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; - -public interface TestableCircuit -{ - void setup(); - - Result run(); - - void clockOn(boolean isClockOn); - - TestEnvironmentHelper getTestEnvironmentHelper(); - - default void assertRunSuccess() - { - assertEquals(Result.SUCCESS, run()); - } - - default void assertFullCycleSuccess() - { - assertRunSuccess(); - clockOn(false); - assertRunSuccess(); - clockOn(true); - assertRunSuccess(); - } - - default void displayState() - { - getTestEnvironmentHelper().displayState(); - } - - public enum Result - { - SUCCESS, OUT_OF_TIME, ERROR; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Test.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Test.java deleted file mode 100644 index 0d55c750..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Test.java +++ /dev/null @@ -1,302 +0,0 @@ -package net.mograsim.logic.model.am2900.am2901; - -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Dest.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Func.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Am2901_Src.*; -import static net.mograsim.logic.model.am2900.am2901.TestableAm2901.Register.*; -import static net.mograsim.logic.model.am2900.util.TestUtil.*; -import static org.junit.jupiter.api.Assertions.*; - -import java.awt.Point; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - -import net.mograsim.logic.model.am2900.am2901.TestableAm2901.Register; -import net.mograsim.logic.model.am2900.util.DisplayStateOnFailure; - -@DisplayName("Am2901 Tests") -@TestMethodOrder(OrderAnnotation.class) -public class Am2901Test -{ - private TestableAm2901 am2901 = new TestableAm2901Impl(); - - @RegisterExtension - DisplayStateOnFailure failureRule = new DisplayStateOnFailure(am2901); - - @BeforeEach - void initialize() - { - createAndSetup(); - setInputsToZero(); - } - - void createAndSetup() - { - am2901.setup(); - } - - void setRegistersToZero() - { - setInputsToZero(); - for (Register r : Register.values()) - { - setRegisterToZero(r); - } - } - - void setRegisterToZero(Register r) - { - am2901.setD("0000"); - am2901.setSrc(DZ); - am2901.setFunc(AND); - setRegOutput(r); - - am2901.assertFullCycleSuccess(); - } - - void setRegOutput(Register r) - { - if (r == Q) - { - am2901.setDest(QREG); - } else - { - am2901.setReg_B(r.toBitString()); - am2901.setDest(RAMF); - } - } - - void setInputsToZero() - { - am2901.setCarryIn("0"); - am2901.setQ_0("0"); - am2901.setQ_3("0"); - am2901.setRAM_0("0"); - am2901.setRAM_3("0"); - am2901.setReg_A("0000"); - am2901.setReg_B("0000"); - am2901.setD("0000"); - am2901.setSrc(AB); - am2901.setFunc(ADD); - am2901.setDest(QREG); -// am2901.setNotOutEnable("0"); TODO - am2901.clockOn(true); - am2901.assertRunSuccess(); - } - - @ParameterizedTest(name = "{0}") - @Order(1) - @DisplayName("Direct / high level access") - @EnumSource(Register.class) - void testDirectAccess(Register r) - { - assertEquals("UUUU", am2901.getDirectly(r)); - - am2901.setDirectly(r, "1011"); - - assertEquals("1011", am2901.getDirectly(r)); - } - - @ParameterizedTest(name = "{0}") - @Order(2) - @DisplayName("Setting each register to 0") - @EnumSource(Register.class) - void testSetToZero(Register r) - { - assertEquals("UUUU", am2901.getDirectly(r)); - - setRegisterToZero(r); - - assertEquals("0000", am2901.getDirectly(r)); - assertEquals("0000", am2901.getY()); - assertEquals("0", am2901.getCarryOut()); - assertEquals("0", am2901.getOverflow()); - assertEquals("0", am2901.getSign()); - assertEquals("1", am2901.getZero()); - } - - @Test - @Order(3) - @DisplayName("Setting all registers to 0") - void testSetAllToZero() - { - setRegistersToZero(); - - assertEquals("0000", am2901.getY()); - assertEquals("0", am2901.getCarryOut()); - assertEquals("0", am2901.getOverflow()); - assertEquals("0", am2901.getSign()); - assertEquals("1", am2901.getZero()); - assertEquals("0", am2901.getQ_0()); - assertEquals("0", am2901.getQ_3()); - assertEquals("0", am2901.getRAM_0()); - assertEquals("0", am2901.getRAM_3()); - - assertAll("register values", Register.stream().map(r -> () -> - { - assertEquals("0000", am2901.getDirectly(r), r.name()); - })); - } - - @Test - @Order(4) - @DisplayName("ADD operation") - void testADD() - { - am2901.setSrc(DA); - am2901.setFunc(ADD); - am2901.setDest(NOP); - am2901.setReg_A(r0.toBitString()); - - assertAll(getAll4BitPairs().map(xy -> () -> - { - am2901.setDirectly(r0, to4bitBin(xy.x)); - am2901.setD(to4bitBin(xy.y)); - - am2901.assertFullCycleSuccess(); - - int res32Bit = xy.x + xy.y; - int res4Bit = res32Bit & 0b1111; - int res32Bit_sgn = signed4ToSigned32(xy.x) + signed4ToSigned32(xy.y); - int res4Bit_sgn = signed4ToSigned32(res32Bit_sgn); - - assertAll("Result of " + xy.x + " + " + xy.y + " = " + res32Bit, - () -> assertEquals(to4bitBin(res32Bit), am2901.getY(), " Y"), - () -> assertEquals(to1bitBin(res4Bit == 0), am2901.getZero(), " F=0"), - () -> assertEquals(to1bitBin(res4Bit & 0b1000), am2901.getSign(), " F3"), - () -> assertEquals(to1bitBin(res32Bit > 15), am2901.getCarryOut(), " Cn+4"), - () -> assertEquals(to1bitBin(res4Bit_sgn != res32Bit_sgn), am2901.getOverflow(), " OVR")); - })); - } - - @Test - @Order(4) - @DisplayName("AND operation") - void testAND() - { - am2901.setSrc(DA); - am2901.setFunc(AND); - am2901.setDest(NOP); - am2901.setReg_A(r0.toBitString()); - - assertAll(getAll4BitPairs().map(xy -> () -> - { - am2901.setDirectly(r0, to4bitBin(xy.x)); - am2901.setD(to4bitBin(xy.y)); - - am2901.assertFullCycleSuccess(); - - int res32Bit = xy.x & xy.y; - - assertAll("Result of " + xy.x + " & " + xy.y + " = " + res32Bit, - () -> assertEquals(to4bitBin(res32Bit), am2901.getY(), " Y"), - () -> assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), " F=0"), - () -> assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), " F3") -// () -> assertEquals(to1bitBin(res32Bit), am2901.getCarryOut(), " Cn+4"), // TODO -// () -> assertEquals(to1bitBin(res32Bit), am2901.getOverflow(), " OVR") // TODO - ); - })); - } - - @Test - @Order(4) - @DisplayName("OR operation") - void testOR() - { - am2901.setSrc(DA); - am2901.setFunc(OR); - am2901.setDest(NOP); - am2901.setReg_A(r0.toBitString()); - - assertAll(getAll4BitPairs().map(xy -> () -> - { - am2901.setDirectly(r0, to4bitBin(xy.x)); - am2901.setD(to4bitBin(xy.y)); - - am2901.assertFullCycleSuccess(); - - int res32Bit = xy.x | xy.y; - - assertAll("Result of " + xy.x + " | " + xy.y + " = " + res32Bit, - () -> assertEquals(to4bitBin(res32Bit), am2901.getY(), " Y"), - () -> assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), " F=0"), - () -> assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), " F3") -// () -> assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getCarryOut(), " Cn+4"), // TODO -// () -> assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getOverflow(), " OVR") // TODO - ); - })); - } - - @Test - @Order(4) - @DisplayName("XOR operation") - void testXOR() - { - am2901.setSrc(DA); - am2901.setFunc(EXOR); - am2901.setDest(NOP); - am2901.setReg_A(r0.toBitString()); - - assertAll(getAll4BitPairs().map(xy -> () -> - { - am2901.setDirectly(r0, to4bitBin(xy.x)); - am2901.setD(to4bitBin(xy.y)); - - am2901.assertFullCycleSuccess(); - - int res32Bit = xy.x ^ xy.y; - - assertAll("Result of " + xy.x + " ^ " + xy.y + " = " + res32Bit, - () -> assertEquals(to4bitBin(res32Bit), am2901.getY(), " Y"), - () -> assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), " F=0"), - () -> assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), " F3")); - })); - } - - @Test - @Order(4) - @DisplayName("SUB operation") - void testSUB() - { - am2901.setSrc(DA); - am2901.setCarryIn("1"); - am2901.setFunc(SUBR); - am2901.setDest(NOP); - am2901.setReg_A(r0.toBitString()); - - assertAll(getAll4BitPairs().map(xy -> () -> - { - am2901.setDirectly(r0, to4bitBin(xy.x)); - am2901.setD(to4bitBin(xy.y)); - - am2901.assertFullCycleSuccess(); - - int res32Bit = xy.x - xy.y; - int res4Bit = res32Bit & 0b1111; - int res32Bit_sgn = signed4ToSigned32(xy.x) - signed4ToSigned32(xy.y); - int res4Bit_sgn = signed4ToSigned32(res32Bit_sgn); - - assertAll("Result of " + xy.x + " - " + xy.y + " = " + res32Bit, - () -> assertEquals(to4bitBin(res32Bit), am2901.getY(), " Y"), - () -> assertEquals(to1bitBin(res4Bit == 0), am2901.getZero(), " F=0"), - () -> assertEquals(to1bitBin(res4Bit & 0b1000), am2901.getSign(), " F3"), - () -> assertEquals(to1bitBin(xy.x >= xy.y), am2901.getCarryOut(), " Cn+4"), - () -> assertEquals(to1bitBin(res4Bit_sgn != res32Bit_sgn), am2901.getOverflow(), " OVR")); - })); - } - - static Stream getAll4BitPairs() - { - return IntStream.range(0, 16).boxed().flatMap(x -> IntStream.range(0, 16).mapToObj(y -> new Point(x, y))); - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java deleted file mode 100644 index 414054e9..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java +++ /dev/null @@ -1,119 +0,0 @@ -package net.mograsim.logic.model.am2900.am2901; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.atomic.ModelAndGate; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.components.atomic.ModelNotGate; -import net.mograsim.logic.model.model.components.atomic.ModelTextComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.ModellingTool; - -@Deprecated -public class Am2901Testbench -{ - public static void main(String[] args) - { - Am2900Loader.setup(); - SimpleLogicUIStandalone.executeVisualisation(Am2901Testbench::createTestbench, Am2901Testbench::beforeRun); - } - - public static void createTestbench(LogicModelModifiable model) - { - ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2901"); - ModellingTool tool = ModellingTool.createFor(model); - - comp.moveTo(240, 0); - - ModelManualSwitch enable = new ModelManualSwitch(model, 1); - ModelWireCrossPoint wcp0 = new ModelWireCrossPoint(model, 1); - ModelNotGate not1 = new ModelNotGate(model, 1); - ModelNotGate not2 = new ModelNotGate(model, 1); - ModelNotGate not3 = new ModelNotGate(model, 1); - ModelAndGate and = new ModelAndGate(model, 1); - tool.connect(wcp0, enable, ""); - tool.connect(wcp0, and, "A"); - tool.connect(wcp0, not1, "A"); - tool.connect(not1, not2, "Y", "A"); - tool.connect(not2, not3, "Y", "A"); - tool.connect(not3, and, "Y", "B"); - enable.moveTo(20, -32.5); - wcp0.moveTo(35, -26); - not1.moveTo(50, -20); - not2.moveTo(80, -20); - not3.moveTo(110, -20); - and.moveTo(135, -30); - Pin last = and.getPin("Y"); - - List inputPinNames = new ArrayList<>(); - List outputPinNames = new ArrayList<>(); - for (Pin p : comp.getPins().values()) - if (p.usage == PinUsage.INPUT) - inputPinNames.add(p.name); - else - outputPinNames.add(p.name); - - inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); - outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY))); - - for (int i = 0; i < inputPinNames.size(); i++) - { - double x = 55 + 70 * (i % 2); - double y = 10 * i; - - ModelWireCrossPoint wcp = new ModelWireCrossPoint(model, 1); - ModelComponent d_ff = IndirectModelComponentCreator.createComponent(model, "dff"); - ModelManualSwitch sw = new ModelManualSwitch(model, 1); - - tool.connect(last, wcp); - tool.connect(wcp, d_ff, "C"); - tool.connect(sw, d_ff, "", "D"); - tool.connect(d_ff, comp, "Q", inputPinNames.get(i)); - last = wcp.getPin(); - - ModelTextComponent label = new ModelTextComponent(model, inputPinNames.get(i)); - - sw.moveTo(x, y + 7.5); - wcp.moveTo(160, y); - d_ff.moveTo(170, y); - label.moveTo(x - 48, y + 8); - } - - for (int i = 0; i < outputPinNames.size(); i++) - { - double x = 300 + 75 * (i % 2); - double y = 10 * i - 2.5; - ModelBitDisplay bd = new ModelBitDisplay(model, 1); - bd.moveTo(x, y); - tool.connect(bd.getInputPin(), comp, outputPinNames.get(i)); - - ModelTextComponent label = new ModelTextComponent(model, outputPinNames.get(i)); - label.moveTo(x + 25, y); - } - } - - public static void beforeRun(VisualisationObjects vis) - { - vis.model.getComponentsByName().values().forEach(c -> - { - if (c instanceof ModelManualSwitch) - { - ModelManualSwitch cCasted = (ModelManualSwitch) c; - cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); - } - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java deleted file mode 100644 index d8899089..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java +++ /dev/null @@ -1,108 +0,0 @@ -package net.mograsim.logic.model.am2900.am2901; - -import java.util.Arrays; -import java.util.stream.Stream; - -import net.mograsim.logic.model.am2900.TestableCircuit; -import net.mograsim.logic.model.am2900.util.TestUtil; - -public interface TestableAm2901 extends TestableCircuit -{ - - void setDest(Am2901_Dest dest); - - void setFunc(Am2901_Func func); - - void setSrc(Am2901_Src src); - - void setReg_A(String val_4_bit); - - void setReg_B(String val_4_bit); - - void setCarryIn(String val_1_bit); - - void setNotOutEnable(String val_1_bit); - - void setD(String val_4_bit); - - void setQ_0(String val_1_bit); - - void setQ_3(String val_1_bit); - - void setRAM_0(String val_1_bit); - - void setRAM_3(String val_1_bit); - - void setDirectly(Register r, String val_4_bit); - - String getQ_0(); - - String getQ_3(); - - String getRAM_0(); - - String getRAM_3(); - - String getNotP(); - - String getNotG(); - - String getCarryOut(); - - String getSign(); - - String getZero(); - - String getOverflow(); - - String getY(); - - String getDirectly(Register r); - - enum Am2901_Dest - { - QREG, NOP, RAMA, RAMF, RAMQD, RAMD, RAMQU, RAMU; - - public boolean doesShift() - { - return ordinal() >= 4; - } - - public int getShiftDir() - { - return doesShift() ? (ordinal() < 6 ? -1 : 1) : 0; - } - - public int getI7() - { - return this.ordinal() >> 1 & 1; - } - } - - enum Am2901_Func - { - ADD, SUBR, SUBS, OR, AND, NOTRS, EXOR, EXNOR; - } - - enum Am2901_Src - { - AQ, AB, ZQ, ZB, ZA, DA, DQ, DZ; - } - - enum Register - { - r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, rA, rB, rC, rD, rE, rF, Q; - - public String toBitString() - { - if (this.ordinal() > 0xF) - throw new UnsupportedOperationException(); - return TestUtil.to4bitBin(this.ordinal()); - } - - public static Stream stream() - { - return Arrays.stream(values()); - } - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java deleted file mode 100644 index bddddea5..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java +++ /dev/null @@ -1,211 +0,0 @@ -package net.mograsim.logic.model.am2900.am2901; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.util.SwitchWithDisplay; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; -import net.mograsim.logic.model.am2900.util.TestUtil; -import net.mograsim.logic.model.model.components.ModelComponent; - -public class TestableAm2901Impl implements TestableAm2901 -{ - private ModelComponent am2901; - private CoreManualSwitch I; - private CoreManualSwitch C; - private CoreManualSwitch Cn; - private CoreManualSwitch D; - private CoreManualSwitch A; - private CoreManualSwitch B; - private CoreBitDisplay Y; - private CoreBitDisplay F_0, Cn_4, OVR, F3; - private SwitchWithDisplay RAMn, RAMn_3, Qn, Qn_3; - - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2901"); - - @Override - public Result run() - { - return testHelper.run(); - } - - @Override - public void setup() - { - testHelper.setup(DebugState.NO_DEBUG); - } - - @Override - public void setDest(Am2901_Dest dest) - { - BitVector oldI = I.getValues(); - I.setState(TestUtil.of(dest.ordinal(), 3).concat(oldI.subVector(3))); - } - - @Override - public void setFunc(Am2901_Func func) - { - BitVector oldI = I.getValues(); - I.setState(oldI.subVector(0, 3).concat(TestUtil.of(func.ordinal(), 3)).concat(oldI.subVector(6))); - } - - @Override - public void setSrc(Am2901_Src src) - { - BitVector oldI = I.getValues(); - I.setState(oldI.subVector(0, 6).concat(TestUtil.of(src.ordinal(), 3))); - } - - @Override - public void setReg_A(String val_4_bit) - { - A.setState(BitVector.parse(val_4_bit)); - } - - @Override - public void setReg_B(String val_4_bit) - { - B.setState(BitVector.parse(val_4_bit)); - } - - @Override - public void setCarryIn(String val_1_bit) - { - Cn.setState(Bit.parse(val_1_bit)); - } - - @Override - public void setNotOutEnable(String val_1_bit) - { - throw new UnsupportedOperationException(); // TODO - } - - @Override - public void setD(String val_4_bit) - { - D.setState(BitVector.parse(val_4_bit)); - } - - @Override - public void setQ_0(String val_1_bit) - { - Qn.setState(Bit.parse(val_1_bit).toVector()); - } - - @Override - public void setQ_3(String val_1_bit) - { - Qn_3.setState(Bit.parse(val_1_bit).toVector()); - } - - @Override - public void setRAM_0(String val_1_bit) - { - RAMn.setState(Bit.parse(val_1_bit).toVector()); - } - - @Override - public void setRAM_3(String val_1_bit) - { - RAMn_3.setState(Bit.parse(val_1_bit).toVector()); - } - - @Override - public void clockOn(boolean isClockOn) - { - C.setState(isClockOn ? Bit.ONE : Bit.ZERO); - } - - @Override - public String getQ_0() - { - return Qn.getDisplayedValue().toString(); - } - - @Override - public String getQ_3() - { - return Qn_3.getDisplayedValue().toString(); - } - - @Override - public String getRAM_0() - { - return RAMn.getDisplayedValue().toString(); - } - - @Override - public String getRAM_3() - { - return RAMn_3.getDisplayedValue().toString(); - } - - @Override - public String getNotP() - { - throw new UnsupportedOperationException(); // TODO - } - - @Override - public String getNotG() - { - throw new UnsupportedOperationException(); // TODO - } - - @Override - public String getCarryOut() - { - return Cn_4.getDisplayedValue().toString(); - } - - @Override - public String getSign() - { - return F3.getDisplayedValue().toString(); - } - - @Override - public String getZero() - { - return F_0.getDisplayedValue().toString(); - } - - @Override - public String getOverflow() - { - return OVR.getDisplayedValue().toString(); - } - - @Override - public String getY() - { - return Y.getDisplayedValue().toString(); - } - - @Override - public void setDirectly(Register r, String val_4_bit) - { - am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_4_bit)); - } - - @Override - public String getDirectly(Register r) - { - return ((BitVector) am2901.getHighLevelState(regToStateID(r))).toString(); - } - - private static String regToStateID(Register r) - { - if (r == Register.Q) - return "qreg.q"; - return "regs.c" + r.toBitString() + ".q"; - } - - @Override - public TestEnvironmentHelper getTestEnvironmentHelper() - { - return testHelper; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Test.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Test.java deleted file mode 100644 index 332f4f64..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Test.java +++ /dev/null @@ -1,211 +0,0 @@ -package net.mograsim.logic.model.am2900.am2904; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - -import net.mograsim.logic.model.am2900.am2904.TestableAm2904.Am2904_Carry; -import net.mograsim.logic.model.am2900.am2904.TestableAm2904.Am2904_Inst; -import net.mograsim.logic.model.am2900.am2904.TestableAm2904.Am2904_ShiftDir; -import net.mograsim.logic.model.am2900.am2904.TestableAm2904.CompleteStatus; -import net.mograsim.logic.model.am2900.am2904.TestableAm2904.Register; -import net.mograsim.logic.model.am2900.util.DisplayStateOnFailure; - -@DisplayName("Am2904 Tests") -@TestMethodOrder(OrderAnnotation.class) -public class Am2904Test -{ - private TestableAm2904 am2904 = new TestableAm2904Impl(); - - @RegisterExtension - DisplayStateOnFailure failureRule = new DisplayStateOnFailure(am2904); - - @BeforeEach - void initialize() - { - createAndSetup(); - setStandardInputs(); - } - - void createAndSetup() - { - am2904.setup(); - } - - void setStandardInputs() - { - am2904.set_CEÂµ("0"); - am2904.set_CEM("0"); - am2904.setI("0000"); - am2904.set_E("0000"); - am2904.set_OEY("1"); - am2904.set_OECT("0"); - am2904.setCarry(Am2904_Carry.CI0); - am2904.setCX("0"); - am2904.setI10(Am2904_ShiftDir.RIGHT); - am2904.setShiftCode("0000"); - am2904.setInstruction(Am2904_Inst.Load_Load_I_Z); - am2904.setSIO0("Z"); - am2904.setSIO3("Z"); - am2904.setQIO0("Z"); - am2904.setQIO3("Z"); - am2904.set_SE("1"); - am2904.setY("ZZZZ"); - am2904.clockOn(true); - am2904.assertRunSuccess(); - } - - @ParameterizedTest(name = "{0}") - @Order(1) - @DisplayName("Direct / high level access") - @EnumSource(Register.class) - void testDirectAccess(Register r) - { - assertEquals("U", am2904.getDirectly(r)); - - am2904.setDirectly(r, "1"); - - assertEquals("1", am2904.getDirectly(r)); - } - - @Test - @Order(2) - void testBasicStateAndOutputs() - { - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getC0()); - assertEquals("0", am2904.getCT()); - assertEquals("Z", am2904.getQIO0()); - assertEquals("Z", am2904.getQIO3()); - assertEquals("Z", am2904.getSIO0()); - assertEquals("Z", am2904.getSIO3()); - assertEquals("ZZZZ", am2904.getY()); - } - - @Test - @Order(3) - void testSimpleLoadTestIZ() - { - am2904.setInstruction(Am2904_Inst.Load_Load_I_Z); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("1000"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - - am2904.setInstruction(Am2904_Inst.Load_Load_I_notZ); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0000"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - } - - @Test - @Order(3) - void testSimpleLoadTestIC() - { - am2904.setInstruction(Am2904_Inst.Load_Load_I_C); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0100"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - - am2904.setInstruction(Am2904_Inst.Load_Load_I_notC); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0000"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - } - - @Test - @Order(3) - void testSimpleLoadTestIN() - { - am2904.setInstruction(Am2904_Inst.Load_Load_I_N); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0010"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - - am2904.setInstruction(Am2904_Inst.Load_Load_I_notN); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0000"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - } - - @Test - @Order(3) - void testSimpleLoadTestIOVR() - { - am2904.setInstruction(Am2904_Inst.Load_Load_I_OVR); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0001"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - - am2904.setInstruction(Am2904_Inst.Load_Load_I_notOVR); - am2904.assertFullCycleSuccess(); - - assertEquals("0", am2904.getCT()); - - am2904.setI("0000"); - am2904.assertFullCycleSuccess(); - - assertEquals("1", am2904.getCT()); - } - - @Test - @Order(3) - void testRegisterContentAfterLoadLoad() - { - am2904.setInstruction(Am2904_Inst.Load_Load_I_Z); - am2904.assertFullCycleSuccess(); - - String[] statusValues = { "0001", "0010", "0100", "1000", "0000", "1111" }; - - for (String status : statusValues) - { - am2904.setI(status); - am2904.assertFullCycleSuccess(); - assertEquals(status, am2904.getDirectly(CompleteStatus.micro)); - assertEquals(status, am2904.getDirectly(CompleteStatus.MAKRO)); - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java deleted file mode 100644 index e46561d5..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.mograsim.logic.model.am2900.am2904; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.Renderer; - -public class Am2904Testbench -{ - public static void main(String[] args) - { - Am2900Loader.setup(); - SimpleLogicUIStandalone.executeVisualisation(Am2904Testbench::create, Am2904Testbench::beforeRun); - } - - public static void create(LogicModelModifiable model) - { - // TODO replace with proper LogicModel deserialization - DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(model, - "jsonfile:Am2904Testbench.json", "testbench"); - testbench.setSize(1000, 1000); - testbench.setOutlineRenderer(new Renderer() - { - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return null; - } - - @Override - public Void getParamsForSerializing(IdentifyParams idParams) - { - return null; - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - // do nothing - } - }); - } - - public static void beforeRun(VisualisationObjects vis) - { - ((SubmodelComponent) vis.model.getComponentsByName().get("testbench")).submodel.getComponentsByName().values().forEach(c -> - { - if (c instanceof ModelManualSwitch) - { - ModelManualSwitch cCasted = (ModelManualSwitch) c; - cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); - } - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java deleted file mode 100644 index e41e3fef..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java +++ /dev/null @@ -1,236 +0,0 @@ -package net.mograsim.logic.model.am2900.am2904; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import net.mograsim.logic.model.am2900.TestableCircuit; - -public interface TestableAm2904 extends TestableCircuit -{ - - void setInstruction(Am2904_Inst inst); - - void setCarry(Am2904_Carry carry); - - void setShiftCode(String val_4_bit); - - void setI10(Am2904_ShiftDir dir); - - void setCX(String val_1_bit); - - void setY(String z_c_n_ovr); - - void setIZ(String val_1_bit); - - void setIC(String val_1_bit); - - void setIOVR(String val_1_bit); - - void setIN(String val_1_bit); - - default void setI(String z_c_n_ovr) - { - setIZ(z_c_n_ovr.substring(0, 1)); - setIC(z_c_n_ovr.substring(1, 2)); - setIN(z_c_n_ovr.substring(2, 3)); - setIOVR(z_c_n_ovr.substring(3, 4)); - } - - void set_CEM(String val_1_bit); - - void set_CEÂµ(String val_1_bit); - - void set_OEY(String val_1_bit); - - void set_OECT(String val_1_bit); - - void set_SE(String val_1_bit); - - void set_EZ(String val_1_bit); - - void set_EC(String val_1_bit); - - void set_EOVR(String val_1_bit); - - void set_EN(String val_1_bit); - - default void set_E(String z_c_n_ovr) - { - set_EZ(z_c_n_ovr.substring(0, 1)); - set_EC(z_c_n_ovr.substring(1, 2)); - set_EN(z_c_n_ovr.substring(2, 3)); - set_EOVR(z_c_n_ovr.substring(3, 4)); - } - - void setSIO0(String val_1_bit); - - void setSIO3(String val_1_bit); - - void setQIO0(String val_1_bit); - - void setQIO3(String val_1_bit); - - void setDirectly(Register r, String val_1_bit); - - void setDirectly(CompleteStatus r, String z_c_n_ovr); - - String getC0(); - - String getCT(); - - String getY(); - - String getSIO0(); - - String getSIO3(); - - String getQIO0(); - - String getQIO3(); - - String getDirectly(Register r); - - String getDirectly(CompleteStatus r); - - enum Am2904_ShiftDir - { - RIGHT, LEFT; - } - - enum Am2904_Carry - { - CI0, CI1, CX, USE_SR; - } - - /** - * Pattern:
- * [microSR]_[machineSR]_[condCodeSource]_[condCode]
- *
- *
Load = load from I inputs (Am2904s)
- *
condCodeSource = Âµ, M, I (and a special case: I and M)
- *
condCode = the boolean term defining the CT output
- *
- */ - enum Am2904_Inst - { - // @formatter:off - LoadM_LoadY_Âµ_NxorOVRorZ(0_00), - Set_Set_Âµ_NxnorOVRornotZ(0_01), - Swap_Swap_Âµ_NxorOVR(0_02), - Reset_Reset_Âµ_NxnorOVR(0_03), - Load_LoadForShiftThroughOvr_Âµ_Z(0_04), - Load_Invert_Âµ_notZ(0_05), - LoadOvrRetain_Load_Âµ_OVR(0_06), - LoadOvrRetain_Load_Âµ_notOVR(0_07), - ResetZ_LoadCarryInvert_Âµ_CorZ(0_10), - SetZ_LoadCarryInvert_Âµ_notCandnotZ(0_11), - ResetC_Load_Âµ_C(0_12), - SetC_Load_Âµ_notC(0_13), - ResetN_Load_Âµ_notCorZ(0_14), - SetN_Load_Âµ_CandnotZ(0_15), - ResetOvr_Load_IM_NxorN(0_16), - SetOvr_Load_IM_NxnorN(0_17), - Load_Load_Âµ_NxorOVRorZ(0_20), - Load_Load_Âµ_NxnorOVRornotZ(0_21), - Load_Load_Âµ_NxorOVR(0_22), - Load_Load_Âµ_NxnorOVR(0_23), - Load_Load_Âµ_Z(0_24), - Load_Load_Âµ_notZ(0_25), - Load_Load_Âµ_OVR(0_26), - Load_Load_Âµ_notOVR(0_27), - LoadCarryInvert_LoadCarryInvert_Âµ_CorZ(0_30), - LoadCarryInvert_LoadCarryInvert_Âµ_notCandnotZ(0_31), - Load_Load_Âµ_C(0_32), - Load_Load_Âµ_notC(0_33), - Load_Load_Âµ_notCorZ(0_34), - Load_Load_Âµ_CandnotZ(0_35), - Load_Load_Âµ_N(0_36), - Load_Load_Âµ_notN(0_37), - Load_Load_M_NxorOVRorZ(0_40), - Load_Load_M_NxnorOVRornotZ(0_41), - Load_Load_M_NxorOVR(0_42), - Load_Load_M_NxnorOVR(0_43), - Load_Load_M_Z(0_44), - Load_Load_M_notZ(0_45), - Load_Load_M_OVR(0_46), - Load_Load_M_notOVR(0_47), - LoadCarryInvert_LoadCarryInvert_M_CorZ(0_50), - LoadCarryInvert_LoadCarryInvert_M_notCandnotZ(0_51), - Load_Load_M_C(0_52), - Load_Load_M_notC(0_53), - Load_Load_M_notCorZ(0_54), - Load_Load_M_CandnotZ(0_55), - Load_Load_M_N(0_56), - Load_Load_M_notN(0_57), - Load_Load_I_NxorOVRorZ(0_60), - Load_Load_I_NxnorOVRornotZ(0_61), - Load_Load_I_NxorOVR(0_62), - Load_Load_I_NxnorOVR(0_63), - Load_Load_I_Z(0_64), - Load_Load_I_notZ(0_65), - Load_Load_I_OVR(0_66), - Load_Load_I_notOVR(0_67), - LoadCarryInvert_LoadCarryInvert_I_notCorZ(0_70), - LoadCarryInvert_LoadCarryInvert_I_CandnotZ(0_71), - Load_Load_I_C(0_72), - Load_Load_I_notC(0_73), - Load_Load_I_notCorZ(0_74), - Load_Load_I_CandnotZ(0_75), - Load_Load_I_N(0_76), - Load_Load_I_notN(0_77); - // @formatter:on - - public final int code; - - private Am2904_Inst(int code) - { - this.code = code; - } - - private static final Map instCodes; - - static - { - Map instCodesMod = new HashMap<>(); - Am2904_Inst[] vals = values(); - for (Am2904_Inst inst : vals) - { - assert inst.code == inst.ordinal(); - instCodesMod.put(inst.code, inst); - } - if (instCodesMod.size() != 64) - throw new IllegalStateException("There must be exactly 64 Am2904 instruction codes, but was " + instCodesMod.size()); - instCodes = Collections.unmodifiableMap(instCodesMod); - } - - public static Am2904_Inst getInstFor(int I_543210) - { - Am2904_Inst inst = instCodes.get(I_543210); - if (inst != null) - return inst; - throw new IllegalArgumentException("Invaild Am2904 instruction code: " + I_543210); - } - - public int getBlock() - { - return code >> 4; - } - - public boolean isLoadCarryInvert() - { - return (code & 0b001_110) == 0b001_000; - } - } - - enum Register - { - ÂµZ, ÂµC, ÂµN, ÂµOVR, MZ, MC, MN, MOVR; - } - - enum CompleteStatus - { - micro, MAKRO; - } - -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json deleted file mode 100644 index 964d7d3d..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json +++ /dev/null @@ -1,846 +0,0 @@ -{ - "width": 0.0, - "height": 0.0, - "interfacePins": [ - { - "location": { - "x": 10.0, - "y": 20.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 145.0, - "y": 125.0 - }, - "name": "C0", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 145.0, - "y": 75.0 - }, - "name": "CT", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 10.0, - "y": 125.0 - }, - "name": "Cx", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 30.0 - }, - "name": "IC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 35.0 - }, - "name": "IN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 40.0 - }, - "name": "IOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 25.0 - }, - "name": "IZ", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": -87.66482568016058, - "y": 58.834004835619645 - }, - "name": "I_10", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": -80.0, - "y": 40.0 - }, - "name": "I_11_12", - "logicWidth": 2, - "usage": "INPUT" - }, - { - "location": { - "x": -85.0, - "y": 100.0 - }, - "name": "I_5_0", - "logicWidth": 6, - "usage": "INPUT" - }, - { - "location": { - "x": -84.26853373181032, - "y": 78.72500503091884 - }, - "name": "I_6_9", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 145.0, - "y": 145.0 - }, - "name": "QIO0", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 10.0, - "y": 145.0 - }, - "name": "QIOn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 145.0, - "y": 135.0 - }, - "name": "SIO0", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 10.0, - "y": 135.0 - }, - "name": "SIOn", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 145.0, - "y": 30.0 - }, - "name": "YC", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 145.0, - "y": 35.0 - }, - "name": "YN", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 145.0, - "y": 40.0 - }, - "name": "YOVR", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 145.0, - "y": 25.0 - }, - "name": "YZ", - "logicWidth": 1, - "usage": "TRISTATE" - }, - { - "location": { - "x": 10.0, - "y": 45.0 - }, - "name": "_CEM", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 50.0 - }, - "name": "_CEmu", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 60.0 - }, - "name": "_EC", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 65.0 - }, - "name": "_EN", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 70.0 - }, - "name": "_EOVR", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 55.0 - }, - "name": "_EZ", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 145.0, - "y": 65.0 - }, - "name": "_OECT", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 80.0, - "y": 10.0 - }, - "name": "_OEY", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 10.0, - "y": 100.0 - }, - "name": "_SE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 1.0, - "submodel": { - "components": [ - { - "id": "Merger", - "name": "Merger#0", - "pos": { - "x": -30.0, - "y": 70.0 - }, - "params": 13 - }, - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": -45.0, - "y": 140.0 - }, - "params": 6 - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": -45.0, - "y": 100.0 - }, - "params": 4 - }, - { - "id": "Splitter", - "name": "Splitter#2", - "pos": { - "x": -45.0, - "y": 70.0 - }, - "params": 2 - }, - { - "id": "Am2904", - "name": "Am2904#0", - "pos": { - "x": 20.0, - "y": 15.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "Am2904#0", - "pinName": "C" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "IZ" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IZ" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EZ" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EZ" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I_5_0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I0" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I1" - }, - "name": "unnamedWire#13", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I2" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "name": "unnamedWire#14", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I3" - }, - "name": "unnamedWire#15", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I4" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O4" - }, - "name": "unnamedWire#16", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O5" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I5" - }, - "name": "unnamedWire#17", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I6" - }, - "name": "unnamedWire#18", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I7" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#19", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "IC" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "IC" - }, - "name": "unnamedWire#2", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I8" - }, - "name": "unnamedWire#20", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I9" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "name": "unnamedWire#21", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#2", - "pinName": "O0" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I11" - }, - "name": "unnamedWire#22", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "I12" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "O1" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I_6_9" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "I" - }, - "name": "unnamedWire#24", - "path": [] - }, - { - "pin1": { - "compName": "Merger#0", - "pinName": "O" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "I" - }, - "name": "unnamedWire#25", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I_10" - }, - "pin2": { - "compName": "Merger#0", - "pinName": "I10" - }, - "name": "unnamedWire#26", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I_11_12" - }, - "pin2": { - "compName": "Splitter#2", - "pinName": "I" - }, - "name": "unnamedWire#27", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_SE" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_SE" - }, - "name": "unnamedWire#28", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Cx" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "Cx" - }, - "name": "unnamedWire#29", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "IN" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "IN" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SIOn" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "SIOn" - }, - "name": "unnamedWire#30", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QIOn" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "QIOn" - }, - "name": "unnamedWire#31", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "QIO0" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "QIO0" - }, - "name": "unnamedWire#32", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "SIO0" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "SIO0" - }, - "name": "unnamedWire#33", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C0" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "C0" - }, - "name": "unnamedWire#34", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "CT" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "CT" - }, - "name": "unnamedWire#35", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_OECT" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_OECT" - }, - "name": "unnamedWire#36", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YOVR" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "YOVR" - }, - "name": "unnamedWire#37", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YN" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "YN" - }, - "name": "unnamedWire#38", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YC" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "YC" - }, - "name": "unnamedWire#39", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "IOVR" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "IOVR" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "YZ" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "YZ" - }, - "name": "unnamedWire#40", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_OEY" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_OEY" - }, - "name": "unnamedWire#41", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_CEM" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_CEM" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_CEmu" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_CEmu" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EC" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "Am2904#0", - "pinName": "_EN" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "_EN" - }, - "name": "unnamedWire#8", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "_EOVR" - }, - "pin2": { - "compName": "Am2904#0", - "pinName": "_EOVR" - }, - "name": "unnamedWire#9", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "default", - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": { - "musr": { - "id": "delegating", - "params": { - "delegateTarget": "Am2904#0", - "prefix": "musr" - } - }, - "msr": { - "id": "delegating", - "params": { - "delegateTarget": "Am2904#0", - "prefix": "msr" - } - } - }, - "atomicHighLevelStates": {} - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java deleted file mode 100644 index b43f130e..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java +++ /dev/null @@ -1,293 +0,0 @@ -package net.mograsim.logic.model.am2900.am2904; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.util.SwitchWithDisplay; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; -import net.mograsim.logic.model.model.components.ModelComponent; - -public class TestableAm2904Impl implements TestableAm2904 -{ - - private ModelComponent am2904; - private CoreManualSwitch I_5_0; - private CoreManualSwitch I_6_9; - private CoreManualSwitch I_10; - private CoreManualSwitch I_11_12; - private CoreManualSwitch C; - private CoreManualSwitch Cx; - private CoreManualSwitch IC, IN, IOVR, IZ; - private CoreManualSwitch _CEM, _CEmu; - private CoreManualSwitch _EC, _EN, _EOVR, _EZ; - private CoreManualSwitch _OECT, _OEY; - private CoreManualSwitch _SE; - private CoreBitDisplay C0; - private CoreBitDisplay CT; - private SwitchWithDisplay SIO0, SIOn, QIO0, QIOn; - private SwitchWithDisplay YC, YN, YOVR, YZ; - - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, - "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/am2904/TestableAm2904.json"); - - @Override - public void setup() - { - testHelper.setup(DebugState.NO_DEBUG); - } - - @Override - public Result run() - { - return testHelper.run(); - } - - @Override - public void clockOn(boolean isClockOn) - { - if (isClockOn) - C.switchFullOn(); - else - C.switchFullOff(); - } - - @Override - public void setInstruction(Am2904_Inst inst) - { - I_5_0.setState(BitVector.from(inst.ordinal(), 6)); - } - - @Override - public void setShiftCode(String val_4_bit) - { - I_6_9.setState(BitVector.parse(val_4_bit)); - } - - @Override - public void setI10(Am2904_ShiftDir dir) - { - I_10.setState(BitVector.from(dir.ordinal(), 1)); - } - - @Override - public void setCarry(Am2904_Carry carry) - { - I_11_12.setState(BitVector.from(carry.ordinal(), 2)); - } - - @Override - public void setCX(String val_1_bit) - { - Cx.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setY(String z_c_n_ovr) - { - var bv = BitVector.parse(z_c_n_ovr); - // correct order apparently unknown, most likely Z-C-N-OVR - YZ.setState(bv.getLSBit(3).toVector()); - YC.setState(bv.getLSBit(2).toVector()); - YN.setState(bv.getLSBit(1).toVector()); - YOVR.setState(bv.getLSBit(0).toVector()); - } - - @Override - public void setIZ(String val_1_bit) - { - IZ.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setIC(String val_1_bit) - { - IC.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setIOVR(String val_1_bit) - { - IOVR.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setIN(String val_1_bit) - { - IN.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_CEM(String val_1_bit) - { - _CEM.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_CEÂµ(String val_1_bit) - { - _CEmu.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_OEY(String val_1_bit) - { - _OEY.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_OECT(String val_1_bit) - { - _OECT.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_SE(String val_1_bit) - { - _SE.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_EZ(String val_1_bit) - { - _EZ.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_EC(String val_1_bit) - { - _EC.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_EOVR(String val_1_bit) - { - _EOVR.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_EN(String val_1_bit) - { - _EN.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setSIO0(String val_1_bit) - { - SIO0.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setSIO3(String val_1_bit) - { - SIOn.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setQIO0(String val_1_bit) - { - QIO0.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setQIO3(String val_1_bit) - { - QIOn.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setDirectly(Register r, String val_1_bit) - { - var bv = (BitVector) am2904.getHighLevelState(regToStateID(r)); - bv = bv.withBitChanged(r.ordinal() % 4, b -> Bit.parse(val_1_bit)); - am2904.setHighLevelState(regToStateID(r), bv); - } - - @Override - public void setDirectly(CompleteStatus r, String z_c_n_ovr) - { - am2904.setHighLevelState(regToStateID(r), BitVector.parse(z_c_n_ovr)); - } - - @Override - public String getC0() - { - return C0.getDisplayedValue().toString(); - } - - @Override - public String getCT() - { - return CT.getDisplayedValue().toString(); - } - - @Override - public String getY() - { - // correct order apparently unknown, most likely Z-C-N-OVR - var y3 = YZ.getDisplayedValue(); - var y2 = YC.getDisplayedValue(); - var y1 = YN.getDisplayedValue(); - var y0 = YOVR.getDisplayedValue(); - return y3.concat(y2).concat(y1).concat(y0).toString(); - } - - @Override - public String getSIO0() - { - return SIO0.getDisplayedValue().toString(); - } - - @Override - public String getSIO3() - { - return SIOn.getDisplayedValue().toString(); - } - - @Override - public String getQIO0() - { - return QIO0.getDisplayedValue().toString(); - } - - @Override - public String getQIO3() - { - return QIOn.getDisplayedValue().toString(); - } - - @Override - public String getDirectly(Register r) - { - var bv = (BitVector) am2904.getHighLevelState(regToStateID(r)); - return bv.getMSBit(r.ordinal() % 4).getSymbol(); - } - - @Override - public String getDirectly(CompleteStatus r) - { - var bv = (BitVector) am2904.getHighLevelState(regToStateID(r)); - return bv.toString(); - } - - private static String regToStateID(Register r) - { - if (r.ordinal() < 4) - return "musr.q"; - return "msr.q"; - } - - private static String regToStateID(CompleteStatus r) - { - if (r == CompleteStatus.micro) - return "musr.q"; - return "msr.q"; - } - - @Override - public TestEnvironmentHelper getTestEnvironmentHelper() - { - return testHelper; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Test.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Test.java deleted file mode 100644 index 18b2578d..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Test.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.mograsim.logic.model.am2900.am2910; - -import static net.mograsim.logic.model.am2900.am2910.TestableAm2910.Am2910_Inst.*; -import static net.mograsim.logic.core.types.Bit.*; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.am2910.TestableAm2910.Register; -import net.mograsim.logic.model.am2900.util.DisplayStateOnFailure; - -@DisplayName("Am2910 Tests") -@TestMethodOrder(OrderAnnotation.class) -public class Am2910Test -{ - private TestableAm2910 am2910 = new TestableAm2910Impl(); - - @RegisterExtension - DisplayStateOnFailure failureRule = new DisplayStateOnFailure(am2910); - - @BeforeEach - void initialize() - { - createAndSetup(); - setStandardInputs(); - } - - void createAndSetup() - { - am2910.setup(); - } - - void setStandardInputs() - { - am2910.set_CC("0"); - am2910.set_CCEN("0"); - am2910.set_OE("0"); - am2910.set_RLD("1"); - am2910.setCI("1"); - am2910.setD("000000000000"); - am2910.setInstruction(JZ); - am2910.clockOn(true); - am2910.assertRunSuccess(); - } - - @ParameterizedTest(name = "{0}") - @Order(1) - @DisplayName("Direct / high level access") - @EnumSource(Register.class) - void testDirectAccess(Register r) - { - String us = U.toVector(r.size()).toString(); - String three = BitVector.from(3, r.size()).toString(); - - assertEquals(us, am2910.getDirectly(r)); - - am2910.setDirectly(r, three); - - assertEquals(three, am2910.getDirectly(r)); - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java deleted file mode 100644 index 59ac5b14..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.mograsim.logic.model.am2900.am2910; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelClock; -import net.mograsim.logic.model.model.components.atomic.ModelClock.ModelClockParams; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class Am2910Testbench -{ - public static void main(String[] args) - { - Am2900Loader.setup(); - SimpleLogicUIStandalone.executeVisualisation(Am2910Testbench::create, Am2910Testbench::beforeRun); - } - - @SuppressWarnings("unused") // for ModelWires being created - public static void create(LogicModelModifiable model) - { - ModelComponent am2910 = IndirectModelComponentCreator.createComponent(model, "Am2910", "Am2910"); - ModelClock C = new ModelClock(model, new ModelClockParams(1000, Orientation.RIGHT)); - ModelManualSwitch D = new ModelManualSwitch(model, 12, "D"); - ModelManualSwitch _RLD = new ModelManualSwitch(model, 1, "_RLD"); - ModelManualSwitch _CC = new ModelManualSwitch(model, 1, "_CC"); - ModelManualSwitch _CCEN = new ModelManualSwitch(model, 1, "_CCEN"); - ModelManualSwitch I = new ModelManualSwitch(model, 4, "I"); - ModelManualSwitch CI = new ModelManualSwitch(model, 1, "CI"); - ModelManualSwitch _OE = new ModelManualSwitch(model, 1, "_OE"); - ModelBitDisplay _FULL = new ModelBitDisplay(model, 1, "_FULL"); - ModelBitDisplay _PL = new ModelBitDisplay(model, 1, "_PL"); - ModelBitDisplay _MAP = new ModelBitDisplay(model, 1, "_MAP"); - ModelBitDisplay _VECT = new ModelBitDisplay(model, 1, "_VECT"); - ModelBitDisplay Y = new ModelBitDisplay(model, 12, "Y"); - - C.moveTo(35, -35); - D.moveTo(10, -20); - _RLD.moveTo(-30, -1.5); - _CC.moveTo(-30, 20); - _CCEN.moveTo(-30, 40); - I.moveTo(-30, 60); - CI.moveTo(75, 45); - _FULL.moveTo(80, 6.5); - _PL.moveTo(30, 85); - _MAP.moveTo(30, 105); - _VECT.moveTo(30, 125); - Y.moveTo(40, 65); - _OE.moveTo(60, 85); - - new ModelWire(model, C.getOutputPin(), am2910.getPin("C"), new Point(60, -27.5)); - new ModelWire(model, D.getOutputPin(), am2910.getPin("D"), new Point(36, -12.5)); - new ModelWire(model, _RLD.getOutputPin(), am2910.getPin("_RLD"), new Point[0]); - new ModelWire(model, _CC.getOutputPin(), am2910.getPin("_CC")); - new ModelWire(model, _CCEN.getOutputPin(), am2910.getPin("_CCEN")); - new ModelWire(model, I.getOutputPin(), am2910.getPin("I")); - new ModelWire(model, CI.getOutputPin(), am2910.getPin("CI"), new Point(100, 52.5), new Point(100, 40)); - new ModelWire(model, am2910.getPin("_FULL"), _FULL.getInputPin(), new Point[0]); - new ModelWire(model, am2910.getPin("_PL"), _PL.getInputPin(), new Point(13, 92.5)); - new ModelWire(model, am2910.getPin("_MAP"), _MAP.getInputPin(), new Point(19, 112.5)); - new ModelWire(model, am2910.getPin("_VECT"), _VECT.getInputPin(), new Point(25, 132.5)); - new ModelWire(model, am2910.getPin("Y"), Y.getInputPin(), new Point(38, 72.5)); - new ModelWire(model, am2910.getPin("_OE"), _OE.getOutputPin()); - } - - public static void beforeRun(VisualisationObjects vis) - { - vis.model.getComponentsByName().values().forEach(c -> - { - if (c instanceof ModelManualSwitch) - { - ModelManualSwitch cCasted = (ModelManualSwitch) c; - cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); - } - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java deleted file mode 100644 index 5290c5a6..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.mograsim.logic.model.am2900.am2910; - -import java.util.Arrays; -import java.util.stream.Stream; - -import net.mograsim.logic.model.am2900.TestableCircuit; - -public interface TestableAm2910 extends TestableCircuit -{ - - void setInstruction(Am2910_Inst inst); - - void set_CCEN(String val_1_bit); - - void setD(String val_12_bit); - - void set_CC(String val_1_bit); - - void setCI(String val_1_bit); - - void set_RLD(String val_1_bit); - - void set_OE(String val_1_bit); - - void setDirectly(Register r, String val_X_bit); - - String getY(); - - String get_FULL(); - - String get_PL(); - - String get_MAP(); - - String get_VECT(); - - String getDirectly(Register r); - - enum Am2910_Inst - { - JZ, CJS, JMAP, CJP, PUSH, JSRP, CJV, JRP, RFCT, RPCT, CRTN, CJPP, LDCT, LOOP, CONT, TWB; - } - - enum Register - { - S_0, S_1, S_2, S_3, S_4, SP, PC, REG_COUNT; - - public static Stream stream() - { - return Arrays.stream(values()); - } - - public int size() - { - if (this == SP) - return 3; - return 12; - } - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java deleted file mode 100644 index 48b85698..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java +++ /dev/null @@ -1,159 +0,0 @@ -package net.mograsim.logic.model.am2900.am2910; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; -import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; -import net.mograsim.logic.model.model.components.ModelComponent; - -public class TestableAm2910Impl implements TestableAm2910 -{ - - private ModelComponent am2901; - private CoreManualSwitch I; - private CoreManualSwitch C; - private CoreManualSwitch CI; - private CoreManualSwitch D; - private CoreManualSwitch _CC; - private CoreManualSwitch _CCEN; - private CoreManualSwitch _RLD; - private CoreManualSwitch _OE; - private CoreBitDisplay _FULL; - private CoreBitDisplay Y; - private CoreBitDisplay _PL, _MAP, _VECT; - - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2910"); - - @Override - public void setup() - { - testHelper.setup(DebugState.NO_DEBUG); - } - - @Override - public Result run() - { - return testHelper.run(); - } - - @Override - public void clockOn(boolean isClockOn) - { - if (isClockOn) - C.switchFullOn(); - else - C.switchFullOff(); - } - - @Override - public void setInstruction(Am2910_Inst inst) - { - I.setState(BitVector.from(inst.ordinal(), 4)); - } - - @Override - public void set_CCEN(String val_1_bit) - { - _CCEN.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setD(String val_12_bit) - { - D.setState(BitVector.parse(val_12_bit)); - } - - @Override - public void set_CC(String val_1_bit) - { - _CC.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setCI(String val_1_bit) - { - CI.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_RLD(String val_1_bit) - { - _RLD.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void set_OE(String val_1_bit) - { - _OE.setState(BitVector.parse(val_1_bit)); - } - - @Override - public void setDirectly(Register r, String val_X_bit) - { - am2901.setHighLevelState(regToStateID(r), BitVector.parse(val_X_bit)); - } - - @Override - public String getY() - { - return Y.getDisplayedValue().toString(); - } - - @Override - public String get_FULL() - { - return _FULL.getDisplayedValue().toString(); - } - - @Override - public String get_PL() - { - return _PL.getDisplayedValue().toString(); - } - - @Override - public String get_MAP() - { - return _MAP.getDisplayedValue().toString(); - } - - @Override - public String get_VECT() - { - return _VECT.getDisplayedValue().toString(); - } - - @Override - public String getDirectly(Register r) - { - return am2901.getHighLevelState(regToStateID(r)).toString(); - } - - private static String regToStateID(Register r) - { - switch (r) - { - case S_0: - case S_1: - case S_2: - case S_3: - case S_4: - return "stack.c" + BitVector.from(r.ordinal(), 3); - case SP: - return "sp.q"; - case PC: - return "mupc.q"; - case REG_COUNT: - return "r.q"; - default: - throw new IllegalArgumentException("unknown: " + r); - } - } - - @Override - public TestEnvironmentHelper getTestEnvironmentHelper() - { - return testHelper; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/DisplayStateOnFailure.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/DisplayStateOnFailure.java deleted file mode 100644 index 3f68c67e..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/DisplayStateOnFailure.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.mograsim.logic.model.am2900.util; - -import java.util.Objects; - -import org.junit.jupiter.api.extension.AfterTestExecutionCallback; -import org.junit.jupiter.api.extension.ExtensionContext; - -import net.mograsim.logic.model.am2900.TestableCircuit; - -public class DisplayStateOnFailure implements AfterTestExecutionCallback -{ - public static final boolean ACTIVE = true; - - private final TestableCircuit circuitUnderTest; - - public DisplayStateOnFailure(TestableCircuit circuitUnderTest) - { - this.circuitUnderTest = Objects.requireNonNull(circuitUnderTest); - } - - @Override - public void afterTestExecution(ExtensionContext context) throws Exception - { - if (ACTIVE && context.getExecutionException().isPresent()) - { - context.getExecutionException().get().printStackTrace(); - circuitUnderTest.displayState(); - } - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java deleted file mode 100644 index c085c52e..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.mograsim.logic.model.am2900.util; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; -import net.mograsim.logic.model.util.ModellingTool; - -public class SwitchWithDisplay -{ - private final Pin pin; - private final ModelBitDisplay modelBitDisplay; - private final ModelManualSwitch modelManualSwitch; - - public SwitchWithDisplay(LogicModelModifiable model, Pin target) - { - pin = target; - modelBitDisplay = new ModelBitDisplay(model, pin.logicWidth); - modelManualSwitch = new ModelManualSwitch(model, pin.logicWidth); - - ModellingTool tool = ModellingTool.createFor(model); - ModelWireCrossPoint crossPoint = new ModelWireCrossPoint(model, pin.logicWidth); - tool.connect(modelBitDisplay.getInputPin(), crossPoint); - tool.connect(modelManualSwitch.getOutputPin(), crossPoint); - } - - public final BitVector getDisplayedValue() - { - return modelBitDisplay.getBitDisplay().getDisplayedValue(); - } - - public final void setState(BitVector bits) - { - modelManualSwitch.getManualSwitch().setState(bits); - } - - public final Pin getPin() - { - return pin; - } - - public final CoreBitDisplay getBitDisplay() - { - return modelBitDisplay.getBitDisplay(); - } - - public final CoreManualSwitch getManualSwitch() - { - return modelManualSwitch.getManualSwitch(); - } - - final ModelBitDisplay getModelBitDisplay() - { - return modelBitDisplay; - } - - final ModelManualSwitch getModelManualSwitch() - { - return modelManualSwitch; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java deleted file mode 100644 index 4bae8ec5..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java +++ /dev/null @@ -1,276 +0,0 @@ -package net.mograsim.logic.model.am2900.util; - -import static org.junit.jupiter.api.Assertions.fail; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Objects; -import java.util.Optional; -import java.util.Queue; -import java.util.Set; -import java.util.TreeSet; - -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.model.LogicUIStandaloneGUI; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.am2900.TestableCircuit; -import net.mograsim.logic.model.am2900.TestableCircuit.Result; -import net.mograsim.logic.model.model.LogicModel; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.modeladapter.CoreModelParameters; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.ModellingTool; - -public class TestEnvironmentHelper -{ - private final TestableCircuit testEnvInstance; - private final Class testEnvClass; - private final String modelId; - private Field componentField; - private Optional timelineField = Optional.empty(); - - private ModelComponent component; - private Timeline timeline; - private LogicModelModifiable logicModel; - private ModellingTool modellingTool; - private HashMap idSwitchMap = new HashMap<>(); - private HashMap idDisplayMap = new HashMap<>(); - - private DebugState debug = DebugState.NO_DEBUG; - private Set wireDebugChangeSet; - private boolean debugWires = false; - public int debugEventThreshold = 10_000; - public int debugEventCount = 500; - private int eventCounter; - - public TestEnvironmentHelper(TestableCircuit testEnv, String modelId) - { - this.testEnvInstance = testEnv; - this.modelId = modelId; - this.testEnvClass = testEnvInstance.getClass(); - for (Field f : testEnvClass.getDeclaredFields()) - { - if (ModelComponent.class.isAssignableFrom(f.getType())) - { - componentField = f; - componentField.setAccessible(true); - } else if (Timeline.class.isAssignableFrom(f.getType())) - { - f.setAccessible(true); - timelineField = Optional.of(f); - } - } - if (componentField == null) - throw new IllegalStateException("No component or timeline field found!"); - } - - public void setup(DebugState debug) - { - this.debug = debug; - // Create logic model - logicModel = new LogicModelModifiable(); - modellingTool = ModellingTool.createFor(logicModel); - Am2900Loader.setup(); - component = IndirectModelComponentCreator.createComponent(logicModel, modelId); - setField(componentField, component); - - component.getPins().values().forEach(this::extendModelPin); - - // Create core model - CoreModelParameters params = new CoreModelParameters(); - params.gateProcessTime = 50; - params.wireTravelTime = 10; - timeline = LogicCoreAdapter.convert(logicModel, params); - timelineField.ifPresent(f -> setField(f, timeline)); - - // Bind switches/displays to this test class - component.getPins().values().forEach(this::bindModelPin); - - if (debug == DebugState.DEBUG_AT_PERFORMANCE_COST) - { - setupDebugging(); - } - timeline.addEventAddedListener(te -> eventCounter++); - } - - private void extendModelPin(Pin p) - { - String javaIdentId = idToJavaIdentifier(p.name); - try - { - Field f = testEnvClass.getDeclaredField(javaIdentId); - Class type = f.getType(); - if (CoreManualSwitch.class.isAssignableFrom(type)) - { - ModelManualSwitch gms = new ModelManualSwitch(logicModel, p.logicWidth); - modellingTool.connect(p, gms.getOutputPin()); - idSwitchMap.put(p.name, gms); - } else if (CoreBitDisplay.class.isAssignableFrom(type)) - { - ModelBitDisplay gbd = new ModelBitDisplay(logicModel, p.logicWidth); - modellingTool.connect(p, gbd.getInputPin()); - idDisplayMap.put(p.name, gbd); - } else if (SwitchWithDisplay.class.isAssignableFrom(type)) - { - SwitchWithDisplay swd = new SwitchWithDisplay(logicModel, p); - setField(f, swd); - } else - { - fail("unkown field type " + type); - } - } - catch (NoSuchFieldException | SecurityException e) - { - fail(e); - } - } - - private void bindModelPin(Pin p) - { - String javaIdentId = idToJavaIdentifier(p.name); - if (idDisplayMap.containsKey(p.name)) - setField(javaIdentId, idDisplayMap.get(p.name).getBitDisplay()); - if (idSwitchMap.containsKey(p.name)) - setField(javaIdentId, idSwitchMap.get(p.name).getManualSwitch()); - } - - private void setupDebugging() - { - // Debug code - HashSet wiresIncludingSubmodels = new HashSet<>(); - Queue modelsToIterate = new LinkedList<>(); - modelsToIterate.add(logicModel); - while (modelsToIterate.size() > 0) - { - LogicModel model = modelsToIterate.poll(); - wiresIncludingSubmodels.addAll(model.getWiresByName().values()); - for (ModelComponent comp : model.getComponentsByName().values()) - if (comp instanceof SubmodelComponent) - modelsToIterate.offer(((SubmodelComponent) comp).submodel); - } - System.out.println(wiresIncludingSubmodels.size()); - logicModel.setRedrawHandler(() -> wiresIncludingSubmodels.forEach(w -> - { - if (debugWires) - { - wireDebugChangeSet.add(w.toString()); - } - })); - } - - public Result run() - { - // Normal execution until completion or eventLimit - int eventLimit = debugEventThreshold; - eventCounter = 0; - debugWires = false; - while (eventCounter < eventLimit) - { - timeline.executeNext(); - if (!timeline.hasNext()) - return Result.SUCCESS; - } - - // Start debugging if event limit is reached (if debug is active) - if (debug == DebugState.DEBUG_AT_PERFORMANCE_COST) - return debugThisRun(); - - return Result.OUT_OF_TIME; - } - - private Result debugThisRun() - { - int eventLimit = debugEventThreshold; - debugWires = true; - wireDebugChangeSet = new TreeSet<>(); - Set oldChangeSet; - // observe wire changes to detect, if we are really stuck in an endless loop - do - { - eventLimit += debugEventCount; - oldChangeSet = wireDebugChangeSet; - wireDebugChangeSet = new TreeSet<>(); - while (eventCounter < eventLimit) - { - timeline.executeNext(); - if (!timeline.hasNext()) - { - // no endless loop, but more events needed than expected - System.out.println("run() took longer than expected: " + eventCounter); - return Result.SUCCESS; - } - } - } while (!oldChangeSet.equals(wireDebugChangeSet)); - // if stuck, abort execution and print wires - System.err.print("Problematic Wire updates:"); - wireDebugChangeSet.forEach(System.out::println); - System.err.println("run() failed: " + eventCounter); - return Result.OUT_OF_TIME; - } - - private static String idToJavaIdentifier(String s) - { - StringBuilder sb = new StringBuilder(s.length()); - char c = s.charAt(0); - sb.append(Character.isJavaIdentifierStart(c) ? c : '_'); - for (int i = 1; i < s.length(); i++) - sb.append(Character.isJavaIdentifierPart(c = s.charAt(i)) ? c : '_'); - return sb.toString(); - } - - private void setField(Field f, S value) - { - try - { - f.setAccessible(true); - f.set(testEnvInstance, Objects.requireNonNull(value)); - } - catch (Exception e) - { - fail(e); - } - } - - private void setField(String name, S value) - { - try - { - Field f = testEnvClass.getDeclaredField(name); - f.setAccessible(true); - f.set(testEnvInstance, Objects.requireNonNull(value)); - } - catch (Exception e) - { - fail(e); - } - } - - public void displayState() - { - try - { - new LogicUIStandaloneGUI(logicModel).run(); - logicModel.setRedrawHandler(null); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public enum DebugState - { - NO_DEBUG, DEBUG_AT_PERFORMANCE_COST; - } -} diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestUtil.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestUtil.java deleted file mode 100644 index 5989dfbe..00000000 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestUtil.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.mograsim.logic.model.am2900.util; - -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.types.BitVector.BitVectorMutator; - -public final class TestUtil -{ - private TestUtil() - { - - } - - /** - * Transforms the last four bits of an int to a string that contains the binary ('1' and '0') representation of the 4 bits - * - * @author Christian Femers - */ - public static String to4bitBin(int x) - { - StringBuilder sb = new StringBuilder(4); - sb.append((x & 0b1000) == 0 ? '0' : '1'); - sb.append((x & 0b0100) == 0 ? '0' : '1'); - sb.append((x & 0b0010) == 0 ? '0' : '1'); - sb.append((x & 0b0001) == 0 ? '0' : '1'); - return sb.toString(); - } - - /** - * Transforms the given boolean to a string that contains the binary ('1' and '0') representation of the bit - * - * @author Christian Femers - */ - public static String to1bitBin(boolean bitIsSet) - { - return bitIsSet ? "1" : "0"; - } - - /** - * Transforms the given int to a string that contains the binary ('1' and '0') representation of the int. "0" is only returned when the - * int is equal to zero. - * - * @author Christian Femers - */ - public static String to1bitBin(int someInt) - { - return someInt != 0 ? "1" : "0"; - } - - /** - * Transforms a 4 bit signed integer (-8 to 7) to a int representing the same number. (Adding leading 1-bits if the 4 bit int is - * negative) - * - * @author Christian Femers - */ - public static int signed4ToSigned32(int signed4bit) - { - if ((signed4bit & 0b1000) > 0) - return signed4bit | 0xFF_FF_FF_F0; - return signed4bit & 0x00_00_00_0F; - } - - /** - * Transforms a 16 bit signed integer (-32768 to 32767 - a short) to a int representing the same number. (Adding leading 1-bits if the - * 16 bit int is negative) - * - * @author Christian Femers - */ - public static int signed16ToSigned32(int signed16bit) - { - return (short) signed16bit; - } - - /** - * Transforms the last n bits of an int to a string that contains the binary ('1' and '0') representation of the n bits - * - * @author Christian Femers - */ - public static String toNbitString(int x, int n) - { - StringBuilder sb = new StringBuilder(n); - for (int i = 0; i < n; i++) - { - sb.append((x >> i) & 1); - } - return sb.reverse().toString(); - } - - public static BitVector of(int value, int length) - { - BitVectorMutator mutator = BitVectorMutator.ofLength(length); - int val = value; - for (int i = length - 1; i >= 0; i--) - { - mutator.setMSBit(i, Bit.lastBitOf(val)); - val >>>= 1; - } - return mutator.toBitVector(); - } -} diff --git a/net.mograsim.logic.model.editor/.classpath b/net.mograsim.logic.model.editor/.classpath deleted file mode 100644 index c4b0fff7..00000000 --- a/net.mograsim.logic.model.editor/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/net.mograsim.logic.model.editor/.gitignore b/net.mograsim.logic.model.editor/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/net.mograsim.logic.model.editor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/net.mograsim.logic.model.editor/.project b/net.mograsim.logic.model.editor/.project deleted file mode 100644 index 4f792a69..00000000 --- a/net.mograsim.logic.model.editor/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - net.mograsim.logic.model.editor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/net.mograsim.logic.model.editor/.settings/org.eclipse.core.resources.prefs b/net.mograsim.logic.model.editor/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/net.mograsim.logic.model.editor/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f8bd225a..00000000 --- a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,456 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=info -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=info -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=140 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=140 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 8f2c0a47..00000000 --- a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,63 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_MoGraSim -formatter_settings_version=16 -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/net.mograsim.logic.model.editor/META-INF/MANIFEST.MF b/net.mograsim.logic.model.editor/META-INF/MANIFEST.MF deleted file mode 100644 index 283c286d..00000000 --- a/net.mograsim.logic.model.editor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Editor -Bundle-SymbolicName: net.mograsim.logic.model.editor -Bundle-Version: 0.1.0.qualifier -Export-Package: net.mograsim.logic.model.editor, - net.mograsim.logic.model.editor.handles, - net.mograsim.logic.model.editor.states, - net.mograsim.logic.model.editor.ui, - net.mograsim.logic.model.editor.util -Require-Bundle: net.mograsim.logic.model;bundle-version="0.1.0", - net.mograsim.preferences;bundle-version="0.1.0", - net.mograsim.logic.model.am2900;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: net.mograsim.logic.model.editor -Bundle-Vendor: Mograsim Team diff --git a/net.mograsim.logic.model.editor/build.properties b/net.mograsim.logic.model.editor/build.properties deleted file mode 100644 index d1763276..00000000 --- a/net.mograsim.logic.model.editor/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -source.. = src/ -bin.includes = META-INF/,\ - .,\ \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java deleted file mode 100644 index 90baafb5..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java +++ /dev/null @@ -1,253 +0,0 @@ -package net.mograsim.logic.model.editor; - -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -import com.google.gson.JsonElement; -import com.google.gson.JsonNull; -import com.google.gson.JsonParser; -import com.google.gson.JsonSyntaxException; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.am2900.Am2900Loader; -import net.mograsim.logic.model.editor.handles.ComponentHandle; -import net.mograsim.logic.model.editor.handles.Handle; -import net.mograsim.logic.model.editor.handles.HandleManager; -import net.mograsim.logic.model.editor.handles.PinHandle; -import net.mograsim.logic.model.editor.states.StateManager; -import net.mograsim.logic.model.editor.ui.DialogManager; -import net.mograsim.logic.model.editor.ui.EditorGUI; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler; -import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; -import net.mograsim.logic.model.snippets.symbolrenderers.DefaultSymbolRenderer; - -public final class Editor -{ - final Selection selection = new Selection(); - final Set copyBuffer = new HashSet<>(); - public final DeserializedSubmodelComponent toBeEdited; - public final HandleManager handleManager; - public final EditorGUI gui; - public final StateManager stateManager; - private final SaveLoadManager saveManager; - private Snapping snapping = Snapping.ABSOLUTE; - private double snapX = 5, snapY = 5; - public final DialogManager dialogManager; - public final EditorUserInput userInput; - - public Editor(DeserializedSubmodelComponent toBeEdited) - { - this.toBeEdited = toBeEdited; - handleManager = new HandleManager(this); - gui = new EditorGUI(this); - userInput = new EditorUserInput(this); - stateManager = new StateManager(this); - handleManager.init(); - saveManager = new SaveLoadManager(this); - dialogManager = new DialogManager(gui.shell); - - gui.open(); - } - - public LogicModelModifiable getSubmodel() - { - return toBeEdited.getSubmodelModifiable(); - } - - public Selection getSelection() - { - return selection; - } - - // TODO: Remove this error prone method: Relative offset may change between multiple moves, - // because Handles have different ways of responding to reqMove(...), causing strange behaviour - @Deprecated - public void moveSelection(double x, double y) - { - Point ref = selection.getTopLeft(); - Point snapped = new Point(x, y); - applySnapping(snapped); - - for (Handle c : selection) - { - double newX, newY; - newX = snapped.x + c.getPosX() - ref.x; - newY = snapped.y + c.getPosY() - ref.y; - c.reqMove(newX, newY); - } - } - - public void moveHandles(double x, double y, Map handleOffsetMap) - { - Point snapped = new Point(x, y); - applySnapping(snapped); - - for (Handle c : handleOffsetMap.keySet()) - { - Point offset = handleOffsetMap.get(c); - double newX, newY; - newX = snapped.x + offset.x; - newY = snapped.y + offset.y; - c.reqMove(newX, newY); - } - } - - public void deleteSelection() - { - selection.forEach(h -> h.reqDelete()); - selection.clear(); - } - - public void copy() - { - copyBuffer.clear(); - Point refPoint = selection.getTopLeft(); - for (Handle h : selection) - { - Optional cInfo = h.reqCopy(refPoint); - if (cInfo.isPresent()) - copyBuffer.add(cInfo.get()); - } - } - - public void paste(double x, double y) - { - selection.clear(); - for (ComponentInfo info : copyBuffer) - { - ModelComponent comp = addComponent(info.identifier, info.params); - ComponentHandle h = handleManager.getHandle(comp); - h.reqMove(info.relX, info.relY); - selection.add(h); - } - moveSelection(x, y); - } - - public void save() - { - saveManager.save(); - } - - public void saveAs() - { - saveManager.openSaveAsDialog(); - } - - public void addComponent(double x, double y) - { - boolean successful = false; - JsonElement params = JsonNull.INSTANCE; - outer: while (!successful) - { - String selected = gui.getAddListSelected(); - try - { - ModelComponent c = addComponent(selected, params); - selection.clear(); - selection.add(handleManager.getHandle(c)); - moveSelection(x, y); - successful = true; - } - catch (@SuppressWarnings("unused") UnsupportedOperationException | JsonSyntaxException | NumberFormatException - | NullPointerException e) - { - String result = DialogManager.openMultiLineTextDialog("Add component", "Create", "Cancel", "Parameters:"); - if (result == null) - break outer; - params = new JsonParser().parse(result); - } - } - } - - private ModelComponent addComponent(String identifier, JsonElement params) - { - return IndirectModelComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params); - } - - public void duplicate() - { - copy(); - Point origin = selection.getTopLeft(); - paste(origin.x + 20, origin.y + 20); - } - - private void applySnapping(Point newP) - { - switch (snapping) - { - case OFF: - break; - case ABSOLUTE: - newP.x = (int) (newP.x / snapX + .5) * snapX; - newP.y = (int) (newP.y / snapY + .5) * snapY; - break; - default: - break; - } - } - - public static class ComponentInfo - { - public final double relX, relY; - public final String identifier; - public final JsonElement params; - - public ComponentInfo(double relX, double relY, String identifier, JsonElement params) - { - this.relX = relX; - this.relY = relY; - this.identifier = identifier; - this.params = params; - } - } - - @SuppressWarnings("unused") - public void addWire(PinHandle a, PinHandle b) - { - new ModelWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]); - } - - public static enum Snapping - { - OFF, ABSOLUTE; - - @Override - public String toString() - { - return super.toString().toLowerCase(); - } - } - - public static void main(String[] args) - { - Am2900Loader.setup(); - openNewEditor(); -// SaveLoadManager.openLoadDialog(); - } - - public static void openNewEditor() - { - DeserializedSubmodelComponent toBeEdited = new DeserializedSubmodelComponent(new LogicModelModifiable(), null, null, null); - toBeEdited.setOutlineRenderer(new DefaultOutlineRenderer(toBeEdited)); - toBeEdited.setSymbolRenderer(new DefaultSymbolRenderer(toBeEdited)); - toBeEdited.setHighLevelStateHandler(new DefaultHighLevelStateHandler()); - new Editor(toBeEdited); - } - - public Snapping getSnapping() - { - return snapping; - } - - public void setSnapping(Snapping snapping) - { - this.snapping = snapping; - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java deleted file mode 100644 index feae04f3..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java +++ /dev/null @@ -1,111 +0,0 @@ -package net.mograsim.logic.model.editor; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.KeyListener; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.editor.ui.EditorGUI; - -public class EditorUserInput -{ - private final EditorGUI gui; - - public EditorUserInput(Editor editor) - { - this.gui = editor.gui; - gui.logicCanvas.addMouseListener(new MouseListener() - { - @Override - public void mouseDoubleClick(MouseEvent e) - { - // TODO Auto-generated method stub - } - - @Override - public void mouseDown(MouseEvent e) - { - Point clicked = editor.gui.logicCanvas.canvasToWorldCoords(e.x, e.y); - switch (e.button) - { - case 1: - editor.handleManager.click(clicked, e.stateMask); - break; - } - - } - - @Override - public void mouseUp(MouseEvent e) - { - } - }); - - gui.logicCanvas.addMouseMoveListener((e) -> - { - Point dest = editor.gui.logicCanvas.canvasToWorldCoords(e.x, e.y); - editor.stateManager.mouseMoved(dest.x, dest.y); - }); - - gui.logicCanvas.addKeyListener(new KeyListener() - { - - @Override - public void keyReleased(KeyEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void keyPressed(KeyEvent e) - { - switch (e.keyCode) - { - case 'c': - if ((e.stateMask & SWT.CTRL) == SWT.CTRL) - editor.stateManager.copy(); - break; - case 'v': - if ((e.stateMask & SWT.CTRL) == SWT.CTRL) - editor.stateManager.paste(); - break; - case 'd': - if ((e.stateMask & SWT.SHIFT) == SWT.SHIFT) - editor.stateManager.duplicate(); - break; - case 'g': - editor.stateManager.grab(); - break; - case 'r': - editor.stateManager.delete(); - break; - case 's': - if ((e.stateMask & SWT.CTRL) == SWT.CTRL) - editor.save(); - break; - case 'a': - if ((e.stateMask & SWT.SHIFT) == SWT.SHIFT) - editor.stateManager.add(); - break; - case 'h': - editor.stateManager.boxSelect(); - break; - } - - } - }); - } - - public Point getCanvasMousePosition() - { - return new Point(gui.logicCanvas.toControl(gui.display.getCursorLocation())); - } - - public Point getWorldMousePosition() - { - return gui.logicCanvas.canvasToWorldCoords(getCanvasMousePosition()); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java deleted file mode 100644 index bbe202b1..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java +++ /dev/null @@ -1,75 +0,0 @@ -package net.mograsim.logic.model.editor; - -import java.io.IOException; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Shell; - -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; - -public class SaveLoadManager -{ - private String savePath = null; - private Editor editor; - - public SaveLoadManager(Editor editor) - { - this.editor = editor; - } - - public void save() - { - if (savePath == null) - openSaveAsDialog(); - else - innerSave(); - } - - public void openSaveAsDialog() - { - Shell fdShell = new Shell(); - FileDialog fd = new FileDialog(fdShell, SWT.SAVE); - fd.setText("Save as..."); - fd.setFilterExtensions(new String[] { "*.json" }); - String result = fd.open(); - fdShell.dispose(); - if (result != null) - { - savePath = result; - innerSave(); - } - } - - private void innerSave() - { - try - { - SubmodelComponentSerializer.serialize(editor.toBeEdited, savePath); - } - catch (IOException e) - { - savePath = null; - System.err.println("Failed to save component!"); - e.printStackTrace(); - } - } - - public static void openLoadDialog() throws IOException - { - Shell fdShell = new Shell(); - FileDialog fd = new FileDialog(fdShell, SWT.OPEN); - fd.setText("Load component..."); - fd.setFilterExtensions(new String[] { "*.json" }); - String result = fd.open(); - fdShell.dispose(); - if (result != null) - { - new Editor((DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(new LogicModelModifiable(), - "jsonfile:" + result)); - } - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java deleted file mode 100644 index bc225eb7..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java +++ /dev/null @@ -1,132 +0,0 @@ -package net.mograsim.logic.model.editor; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.function.DoubleBinaryOperator; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.editor.handles.Handle; - -public class Selection implements Iterable -{ - private Set selection = new HashSet<>(); - - public Map calculateOffsets() - { - Map offsets = new HashMap<>(); - Point ref = getTopLeft(); - selection.forEach(h -> offsets.put(h, new Point(h.getPosX() - ref.x, h.getPosY() - ref.y))); - return offsets; - } - - public Rectangle getBounds() - { - Point pos1 = getTopLeft(); - Point pos2 = getBottomRight(); - return new Rectangle(pos1.x, pos1.y, pos2.x - pos1.x, pos2.y - pos1.y); - } - - public double getWidth() - {// TODO: Compute this more efficiently - return getTopRight().x - getTopLeft().x; - } - - public double getHeight() - { - return getBottomLeft().y - getTopLeft().y; - } - - public Point getTopLeft() - { - return getCorner(Double.MAX_VALUE, Double::min, r -> 0, Double.MAX_VALUE, Double::min, r -> 0); - } - - public Point getTopRight() - { - return getCorner(-Double.MAX_VALUE, Double::max, r -> r.width, Double.MAX_VALUE, Double::min, r -> 0); - } - - public Point getBottomLeft() - { - return getCorner(Double.MAX_VALUE, Double::min, r -> 0, -Double.MAX_VALUE, Double::max, r -> r.height); - } - - public Point getBottomRight() - { - return getCorner(-Double.MAX_VALUE, Double::max, r -> r.width, -Double.MAX_VALUE, Double::max, r -> r.height); - } - - public Point getCorner(double xIdentity, DoubleBinaryOperator xOp, Offset xOffset, double yIdentity, DoubleBinaryOperator yOp, - Offset yOffset) - { - double x = xIdentity, y = yIdentity; - for (Handle c : selection) - { - Rectangle bounds = c.getBounds(); - x = xOp.applyAsDouble(x, bounds.x + xOffset.computeOffset(bounds)); - y = yOp.applyAsDouble(y, bounds.y + yOffset.computeOffset(bounds)); - } - return new Point(x, y); - } - - private static interface Offset - { - public double computeOffset(Rectangle bounds); - } - - public void add(Handle h) - { - selection.add(h); - h.onSelect(); - } - - public void remove(Handle h) - { - selection.remove(h); - h.onDeselect(); - } - - public void clear() - { - selection.forEach(h -> h.onDeselect()); - selection.clear(); - } - - public int size() - { - return selection.size(); - } - - public boolean contains(Handle h) - { - return selection.contains(h); - } - - public void addAll(Collection handles) - { - handles.forEach(h -> h.onSelect()); - selection.addAll(handles); - } - - @Override - public Iterator iterator() - { - return selection.iterator(); - } - - @Override - public String toString() - { - return selection.toString(); - } - - public boolean isEmpty() - { - return selection.isEmpty(); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java deleted file mode 100644 index 14868e94..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java +++ /dev/null @@ -1,107 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import java.util.Optional; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Font; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.editor.Editor.ComponentInfo; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.serializing.IdentifyParams; - -public class ComponentHandle extends Handle -{ - private final LogicModelModifiable model; - public final ModelComponent parent; - private final static double POS_OFFSET = 2.0d; - private final static double LENGTH_OFFSET = POS_OFFSET * 2; - boolean selected = false; - - public ComponentHandle(LogicModelModifiable model, ModelComponent parent) - { - super(4); - this.model = model; - this.parent = parent; - Rectangle bounds = parent.getBounds(); - setSize(bounds.width, bounds.height); - parent.addComponentResizedListener((c) -> - { - Rectangle pBounds = c.getBounds(); - setSize(pBounds.width, pBounds.height); - }); - moveTo(parent.getPosX(), parent.getPosY()); - } - - @Override - protected void moveTo(double x, double y) - { - super.moveTo(x, y); - parent.moveTo(x, y); - } - - @Override - protected void render(GeneralGC gc) - { - if (selected) - { - gc.setLineWidth(2); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW)); - Rectangle bounds = getBounds(); - bounds.x -= POS_OFFSET; - bounds.y -= POS_OFFSET; - bounds.width += LENGTH_OFFSET; - bounds.height += LENGTH_OFFSET; - gc.drawRectangle(bounds); - Font oldFont = gc.getFont(); - gc.setFont(new Font(oldFont.getName(), 5, oldFont.getStyle())); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK)); - gc.drawText(parent.getName(), bounds.x, bounds.y, true); - gc.setFont(oldFont); - } - } - - @Override - public void reqMove(double x, double y) - { - moveTo(x, y); - } - - @Override - public void onSelect() - { - selected = true; - callRedrawListeners(); - } - - @Override - public void onDeselect() - { - selected = false; - callRedrawListeners(); - } - - @Override - public void reqDelete() - { - model.destroyComponent(parent); - } - - @Override - public Optional reqCopy(Point refPoint) - { - IdentifyParams idParams = new IdentifyParams(); - return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, - parent.getIDForSerializing(idParams), parent.getParamsForSerializingJSON(idParams))); - } - - @Override - public HandleType getType() - { - return HandleType.COMPONENT; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java deleted file mode 100644 index 959fb896..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; - -public class CornerHandle extends Handle -{ - private final static int LENGTH = 5; - private final DeserializedSubmodelComponent toBeEdited; - private boolean selected; - - public CornerHandle(DeserializedSubmodelComponent toBeEdited) - { - super(0); - this.toBeEdited = toBeEdited; - setSize(LENGTH, LENGTH); - initPos(); - } - - @Override - protected void render(GeneralGC gc) - { - gc.setBackground(Display.getCurrent().getSystemColor(selected ? SWT.COLOR_YELLOW : SWT.COLOR_DARK_GREEN)); - gc.fillRectangle(getPosX(), getPosY(), LENGTH, LENGTH); - } - - private void initPos() - { - Rectangle bounds = toBeEdited.getBounds(); - double subScale = toBeEdited.getSubmodelScale(); - moveTo(bounds.width / subScale, bounds.height / subScale); - } - - @Override - public void reqMove(double x, double y) - { - moveTo(x, y); - } - - @Override - public void onSelect() - { - selected = true; - callRedrawListeners(); - } - - @Override - public void onDeselect() - { - selected = false; - callRedrawListeners(); - } - - @Override - protected void moveTo(double x, double y) - { - super.moveTo(x, y); - double subScale = toBeEdited.getSubmodelScale(); - toBeEdited.setSize(x * subScale, y * subScale); - } - - @Override - public HandleType getType() - { - return HandleType.CORNER; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java deleted file mode 100644 index cbfe2a2a..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java +++ /dev/null @@ -1,150 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Optional; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.editor.Editor.ComponentInfo; -import net.mograsim.logic.model.editor.states.EditorState; - -public abstract class Handle -{ - private final Rectangle bounds; - private final Collection redrawListeners, destroyListeners; - private final int priority; - - public Handle(int priority) - { - this.priority = priority; - redrawListeners = new ArrayList<>(); - destroyListeners = new ArrayList<>(); - bounds = new Rectangle(0, 0, 0, 0); - callRedrawListeners(); - } - - final public void render(GeneralGC gc, Rectangle visibleRegion) - { - if (bounds.intersects(visibleRegion)) - render(gc); - } - - protected abstract void render(GeneralGC gc); - - protected void setSize(double width, double height) - { - bounds.width = width; - bounds.height = height; - callRedrawListeners(); - } - - protected void moveTo(double x, double y) - { - bounds.x = x; - bounds.y = y; - callRedrawListeners(); - } - - public Rectangle getBounds() - { - return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height); - } - - public void addRedrawListener(Runnable listener) - { - redrawListeners.add(listener); - } - - public void removeRedrawListener(Runnable listener) - { - redrawListeners.remove(listener); - } - - protected void callRedrawListeners() - { - redrawListeners.forEach(l -> l.run()); - } - - public double getPosX() - { - return bounds.x; - } - - public double getPosY() - { - return bounds.y; - } - - void destroy() - { - destroyListeners.forEach(l -> l.run()); - } - - public void addDestroyListener(Runnable listener) - { - redrawListeners.add(listener); - } - - public void removeDestroyListener(Runnable listener) - { - redrawListeners.remove(listener); - } - - public boolean contains(double x, double y) - { - return bounds.contains(x, y); - } - - public boolean contains(Point p) - { - return contains(p.x, p.y); - } - - /** - * Register a mouse click - * - * @param x Coordinate of the click in the world, not the display context - * @param y Coordinate of the click in the world, not the display context - * @return true if the click was consumed, false otherwise - */ - public boolean click(double x, double y, int stateMask, EditorState state) - { - if (contains(x, y)) - return state.clickedHandle(new HandleClickInfo(this, stateMask)); - return false; - } - - //@formatter:off - public void reqMove(double x, double y) {} - public void reqDelete() {} - public Optional reqCopy(Point refPoint) { return Optional.empty(); } - public void onSelect() {} - public void onDeselect() {} - //@formatter:on - - public final int getPriority() - { - return priority; - } - - public abstract HandleType getType(); - - public static enum HandleType - { - COMPONENT, STATIC_PIN, INTERFACE_PIN, WIRE_POINT, WIRE, CORNER; - } - - public static class HandleClickInfo - { - public final int stateMask; - public final Handle clicked; - - HandleClickInfo(Handle clicked, int stateMask) - { - this.clicked = clicked; - this.stateMask = stateMask; - } - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java deleted file mode 100644 index 0a33509c..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java +++ /dev/null @@ -1,390 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; -import java.util.stream.Collectors; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.states.EditorState; -import net.mograsim.logic.model.editor.util.PrioritySet; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.MovablePin; -import net.mograsim.logic.model.model.wires.Pin; - -public class HandleManager -{ - private final Map handlePerPin; - private final Map handlePerInterfacePin; - private final Map> pointHandlesPerWire; - private final Map handlePerWire; - private final Set handles; - private final Set wirePointHandles; - private final Map handlePerComp; - - private final Collection> handleAddedListeners; - private final Collection> handleRemovedListeners; - private final Editor editor; - private boolean initialized = false; - - public HandleManager(Editor editor) - { - this.editor = editor; - handlePerPin = new HashMap<>(); - handlePerInterfacePin = new HashMap<>(); - pointHandlesPerWire = new HashMap<>(); - handlePerComp = new HashMap<>(); - handles = new PrioritySet<>((a, b) -> Integer.compare(a.getPriority(), b.getPriority())); - wirePointHandles = new HashSet<>(); - handlePerWire = new HashMap<>(); - - handleAddedListeners = new ArrayList<>(); - handleRemovedListeners = new ArrayList<>(); - - LogicModelModifiable model = editor.getSubmodel(); - - model.addComponentAddedListener(c -> registerComponent(c)); - - model.addComponentRemovedListener(c -> - { - removeComponentHandle(c); - }); - - model.addWireAddedListener(w -> - { - registerWire(w); - }); - - model.addWireRemovedListener(w -> - { - removeWireHandle(w); - removeWirePointHandles(w); - }); - } - - //////////////////////////////////////// - // -- Setting up initial handles -- /// - ////////////////////////////////////// - - public void init() - { - if (initialized) - System.err.println("Warning! HandleManager was already initialized."); - else - { - LogicModelModifiable model = editor.getSubmodel(); - Map compsByName = model.getComponentsByName(); - Set comps = new HashSet<>(compsByName.values()); - ModelComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME); - comps.remove(interfaceComp); - registerInterfaceComponent(interfaceComp); - comps.forEach(c -> registerComponent(c)); - - model.getWiresByName().values().forEach(w -> registerWire(w)); - addHandle(new CornerHandle(editor.toBeEdited)); - } - } - - private void registerInterfaceComponent(ModelComponent c) - { - c.getPins().values().forEach(p -> addInterfacePinHandle(p)); - c.addPinAddedListener(p -> addInterfacePinHandle(p)); - c.addPinRemovedListener(p -> removeInterfacePinHandle(p)); - } - - private void registerComponent(ModelComponent c) - { - addComponentHandle(c); - - c.getPins().values().forEach(p -> addPinHandle(p)); - - c.addPinAddedListener(p -> addPinHandle(p)); - c.addPinRemovedListener(p -> removePinHandle(p)); - } - - private void registerWire(ModelWire wire) - { - Point[] path = wire.getPath(); - AtomicInteger oldLength = new AtomicInteger(path == null ? 0 : path.length); - wire.addPathChangedListener(w -> - { - Point[] newPath = w.getPath(); - int newLength = newPath == null ? 0 : newPath.length; - int diff = newLength - oldLength.getAndSet(newLength); - if (diff != 0) - { - if (diff > 0) - { - for (int i = 0; i < diff; i++) - addWirePointHandle(w); - } - - List wpHandles = pointHandlesPerWire.get(w); - int size = wpHandles.size(); - for (int i = 0; i < size; i++) - { - wpHandles.get(i).setIndex(i); - } - } - pointHandlesPerWire.get(w).forEach(h -> h.updatePos()); - }); - addWireHandle(wire); - if (path == null) - return; - for (int i = 0; i < path.length; i++) - { - addWirePointHandle(wire); - } - } - - ///////////////////////////////////// - // -- Adding/Removing handles -- /// - /////////////////////////////////// - - private void addComponentHandle(ModelComponent c) - { - ComponentHandle h = new ComponentHandle(editor.getSubmodel(), c); - handlePerComp.put(c, h); - addHandle(h); - } - - private void removeComponentHandle(ModelComponent c) - { - ComponentHandle h = handlePerComp.get(c); - handlePerComp.remove(c); - removeHandle(h); - } - - private void addPinHandle(Pin owner) - { - StaticPinHandle h = new StaticPinHandle(owner); - handlePerPin.put(owner, h); - addHandle(h); - } - - private void removePinHandle(Pin owner) - { - StaticPinHandle h = handlePerPin.get(owner); - handlePerPin.remove(owner); - removeHandle(h); - } - - private void addInterfacePinHandle(Pin p) - { - // The following is not an alternative to the cast, because the new pin is not yet in the map, when the listener is called - // editor.toBeEdited.getSubmodelMovablePins().get(p.name); - MovablePin pM = (MovablePin) p; - InterfacePinHandle h = new InterfacePinHandle(pM, editor.toBeEdited); - handlePerInterfacePin.put(pM, h); - addHandle(h); - } - - private void removeInterfacePinHandle(Pin p) - { - InterfacePinHandle h = handlePerInterfacePin.get(p); - handlePerInterfacePin.remove(p); - removeHandle(h); - } - - private void addWirePointHandle(ModelWire w) - { - List wireHandles = pointHandlesPerWire.get(w); - WirePointHandle h; - if (wireHandles != null) - wireHandles.add(h = new WirePointHandle(this, w, wireHandles.size())); - else - { - wireHandles = new ArrayList<>(); - h = new WirePointHandle(this, w, 0); - wireHandles.add(h); - pointHandlesPerWire.put(h.parent, wireHandles); - } - this.wirePointHandles.add(h); - addHandle(h); - } - - void destroyWirePointHandle(ModelWire owner, WirePointHandle h) - { - if (pointHandlesPerWire.containsKey(owner)) - { - List handles = pointHandlesPerWire.get(owner); - int pointIndex = handles.indexOf(h); - handles.remove(pointIndex); - removeHandle(h); - owner.removePathPoint(pointIndex); - } - } - - private void removeWirePointHandles(ModelWire owner) - { - if (!pointHandlesPerWire.containsKey(owner)) - return; - pointHandlesPerWire.get(owner).forEach(h -> - { - wirePointHandles.remove(h); - removeHandle(h); - }); - pointHandlesPerWire.remove(owner); - } - - private void addWireHandle(ModelWire w) - { - WireHandle h = new WireHandle(editor.getSubmodel(), w); - handlePerWire.put(w, h); - addHandle(h); - } - - private void removeWireHandle(ModelWire w) - { - WireHandle h = handlePerWire.get(w); - handlePerWire.remove(w); - removeHandle(h); - } - - private void addHandle(Handle h) - { - handles.add(h); - callHandleAddedListeners(h); - } - - private void removeHandle(Handle h) - { - handles.remove(h); - callHandleRemovedListeners(h); - h.destroy(); - } - - public StaticPinHandle getHandle(Pin parent) - { - return handlePerPin.get(parent); - } - - public ComponentHandle getHandle(ModelComponent parent) - { - return handlePerComp.get(parent); - } - - public WireHandle getHandle(ModelWire parent) - { - return handlePerWire.get(parent); - } - - public Handle getInterfacePinHandle(Pin p) - { - return handlePerInterfacePin.get(p); - } - - /** - * @return A Collection of the registered {@link WirePointHandle}s of the specified wire - */ - public Collection getWirePointHandles(ModelWire parent) - { - return pointHandlesPerWire.get(parent).stream().collect(Collectors.toSet()); - } - - /** - * @return An unmodifiable view of all registered {@link Handle}s - */ - public Collection getHandles() - { - return Collections.unmodifiableCollection(handles); - } - - /** - * @return An unmodifiable view of all registered {@link StaticPinHandle}s - */ - public Collection getPinHandles() - { - return Collections.unmodifiableCollection(handlePerPin.values()); - } - - /** - * @return An unmodifiable view of all registered {@link InterfacePinHandle}s - */ - public Collection getInterfacePinHandles() - { - return Collections.unmodifiableCollection(handlePerInterfacePin.values()); - } - - /** - * @return An unmodifiable view of all registered {@link ComponentHandle}s - */ - public Collection getComponentHandles() - { - return Collections.unmodifiableCollection(handlePerComp.values()); - } - - /** - * @return An unmodifiable view of all registered {@link WireHandle}s - */ - public Collection getWireHandles() - { - return Collections.unmodifiableCollection(handlePerWire.values()); - } - - /** - * @return An unmodifiable view of all registered {@link WirePointHandle}s - */ - public Collection getWirePointHandles() - { - return Collections.unmodifiableSet(wirePointHandles); - } - - public void click(Point clicked, int stateMask) - { - EditorState entryState = editor.stateManager.getState(); - // TODO: As soon as wires connected to a component being removed also are removed, change priority) - if (!click(handles, clicked, entryState, stateMask)) - entryState.clickedEmpty(clicked, stateMask); - entryState.clicked(clicked, stateMask); - } - - private static boolean click(Collection handles, Point clicked, EditorState state, int stateMask) - { - for (Handle h : handles) - if (h.click(clicked.x, clicked.y, stateMask, state)) - return true; - return false; - } - - public void addHandleAddedListener(Consumer c) - { - handleAddedListeners.add(c); - } - - private void callHandleAddedListeners(Handle added) - { - handleAddedListeners.forEach(l -> l.accept(added)); - } - - public void removeHandleAddedListener(Consumer c) - { - handleAddedListeners.remove(c); - } - - public void addHandleRemovedListener(Consumer c) - { - handleRemovedListeners.add(c); - } - - private void callHandleRemovedListeners(Handle removed) - { - handleRemovedListeners.forEach(l -> l.accept(removed)); - } - - public void removeHandleRemovedListener(Consumer c) - { - handleRemovedListeners.remove(c); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java deleted file mode 100644 index 189d3d17..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java +++ /dev/null @@ -1,108 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.model.wires.MovablePin; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; - -public class InterfacePinHandle extends PinHandle -{ - private final static int CIRCLE_DIAM = 4, CIRCLE_RADIUS = CIRCLE_DIAM / 2, SELECTED_CIRCLE_OFFSET = 1, - SELECTED_CIRCLE_DIAM = SELECTED_CIRCLE_OFFSET * 2 + CIRCLE_DIAM; - private final MovablePin parent; - private final DeserializedSubmodelComponent owner; - private boolean selected = false; - - public InterfacePinHandle(MovablePin parent, DeserializedSubmodelComponent pinOwner) - { - super(2); - this.parent = parent; - this.owner = pinOwner; - setSize(CIRCLE_DIAM, CIRCLE_DIAM); - initPos(); - } - - private void initPos() - { - Point pos = parent.getPos(); - moveTo(pos.x, pos.y); - } - - @Override - protected void render(GeneralGC gc) - { - double x = getPosX(), y = getPosY(); - - gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - gc.drawText(parent.name, x + CIRCLE_DIAM, y + CIRCLE_DIAM, true); - if (selected) - { - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW)); - gc.drawOval(x - SELECTED_CIRCLE_OFFSET, y - SELECTED_CIRCLE_OFFSET, SELECTED_CIRCLE_DIAM, SELECTED_CIRCLE_DIAM); - } - gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM); - } - - @Override - public void reqMove(double x, double y) - { - moveTo(x, y); - } - - @Override - public void onSelect() - { - selected = true; - callRedrawListeners(); - } - - @Override - public void onDeselect() - { - selected = false; - callRedrawListeners(); - } - - @Override - public void reqDelete() - { - owner.removeSubmodelInterface(parent.name); - } - - @Override - protected void moveTo(double x, double y) - { - super.moveTo(x - CIRCLE_RADIUS, y - CIRCLE_RADIUS); - parent.setRelPos(getCenterX(), getCenterY()); - } - - @Override - public double getCenterX() - { - return getPosX() + CIRCLE_RADIUS; - } - - @Override - public double getCenterY() - { - return getPosY() + CIRCLE_RADIUS; - } - - @Override - public HandleType getType() - { - return HandleType.INTERFACE_PIN; - } - - @Override - public Pin getPin() - { - return parent; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java deleted file mode 100644 index 2e4a9dc6..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import net.mograsim.logic.model.model.wires.Pin; - -public abstract class PinHandle extends Handle -{ - public PinHandle(int priority) - { - super(priority); - } - - public abstract Pin getPin(); - - public abstract double getCenterX(); - - public abstract double getCenterY(); -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java deleted file mode 100644 index 0f4a1524..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java +++ /dev/null @@ -1,61 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.model.wires.Pin; - -public class StaticPinHandle extends PinHandle -{ - private final static int CIRCLE_DIAM = 2; - private final static int CIRCLE_RADIUS = 1; - private final Pin parent; - - public StaticPinHandle(Pin parent) - { - super(1); - this.parent = parent; - setSize(CIRCLE_DIAM, CIRCLE_DIAM); - parent.addPinMovedListener((p) -> updatePos()); - updatePos(); - } - - @Override - protected void render(GeneralGC gc) - { - gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GREEN)); - gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM); - } - - private void updatePos() - { - Point pos = parent.getPos(); - moveTo(pos.x - CIRCLE_RADIUS, pos.y - CIRCLE_RADIUS); - } - - @Override - public double getCenterX() - { - return getPosX() + CIRCLE_RADIUS; - } - - @Override - public double getCenterY() - { - return getPosY() + CIRCLE_RADIUS; - } - - @Override - public HandleType getType() - { - return HandleType.STATIC_PIN; - } - - @Override - public Pin getPin() - { - return parent; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java deleted file mode 100644 index 839c2b5b..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java +++ /dev/null @@ -1,161 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import java.util.Optional; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.editor.states.EditorState; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.wires.ModelWire; - -public class WireHandle extends Handle -{ - private boolean selected = false; - private final static double WIDTH = 2.0; - private final static double WIDTH_SQUARED = WIDTH * WIDTH; - private final LogicModelModifiable model; - public final ModelWire parent; - - public WireHandle(LogicModelModifiable model, ModelWire parent) - { - super(5); - this.model = model; - this.parent = parent; - parent.addPathChangedListener(c -> updateBounds()); - updateBounds(); - } - - @Override - void destroy() - { - super.destroy(); - parent.removePathChangedListener(c -> updateBounds()); - } - - public void updateBounds() - { - Rectangle r = parent.getBounds(); - moveTo(r.x, r.y); - setSize(r.width, r.height); - } - - @Override - public void render(GeneralGC gc) - { - if (selected) - { - gc.setLineWidth(WIDTH); - gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_YELLOW)); - gc.drawPolyline(parent.getEffectivePath()); - } - } - - @Override - public void onSelect() - { - selected = true; - callRedrawListeners(); - } - - @Override - public void onDeselect() - { - selected = false; - callRedrawListeners(); - } - - @Override - public void reqDelete() - { - // this wire could already be removed implicitly when removing a selection containing both wires and components - if (model.getWireByName(parent.name) != null) - model.destroyWire(parent); - } - - @Override - public boolean contains(double x, double y) - { - return click(parent, x, y).isPresent(); - } - - @Override - public boolean click(double x, double y, int stateMask, EditorState state) - { - Optional op = click(parent, x, y); - if (op.isEmpty()) - return false; - WireClickData data = op.get(); - return state.clickedHandle(new WireHandleClickInfo(this, data.segment, data.pos, stateMask)); - } - - public static class WireHandleClickInfo extends HandleClickInfo - { - public final int segment; - public final Point posOnWire; - - WireHandleClickInfo(WireHandle clicked, int segment, Point posOnWire, int stateMask) - { - super(clicked, stateMask); - this.segment = segment; - this.posOnWire = posOnWire; - } - - } - - private static Optional click(ModelWire w, double x, double y) - { - Rectangle modifiedBounds = w.getBounds(); - modifiedBounds.x -= WIDTH; - modifiedBounds.y -= WIDTH; - modifiedBounds.width += WIDTH * 2; - modifiedBounds.height += WIDTH * 2; - if (modifiedBounds.contains(x, y)) - { - double[] effectivePath = w.getEffectivePath(); - for (int i = 3; i < effectivePath.length; i += 2) - { - double a1 = effectivePath[i - 3], a2 = effectivePath[i - 2], b1 = effectivePath[i - 1], b2 = effectivePath[i], r1 = b2 - a2, - r2 = a1 - b1; - - double f = ((x - a1) * r2 + (a2 - y) * r1) / (-r2 * r2 - r1 * r1); - if (f >= 0 && f <= 1) - { - double e1 = a1 + f * (b1 - a1), e2 = a2 + f * (b2 - a2); - r1 = e1 - x; - r2 = e2 - y; - if (r1 * r1 + r2 * r2 <= WIDTH_SQUARED) - return Optional.of(new WireClickData(new Point(e1, e2), (i / 2) - 1)); - } - } - } - return Optional.empty(); - } - - private final static class WireClickData - { - WireClickData(Point pos, int segment) - { - this.pos = pos; - this.segment = segment; - } - - /** - * Position on the wire that is closest to the click - */ - public final Point pos; - /** - * Segment of the wire that the {@link Point} pos is on - */ - public final int segment; - } - - @Override - public HandleType getType() - { - return HandleType.WIRE; - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java deleted file mode 100644 index 2947535f..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java +++ /dev/null @@ -1,89 +0,0 @@ -package net.mograsim.logic.model.editor.handles; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.model.model.wires.ModelWire; - -public class WirePointHandle extends Handle -{ - private final static int END_OFFSET = 4; - private final HandleManager manager; - private boolean selected = false; - public final ModelWire parent; - - private int pointIndex; - - public WirePointHandle(HandleManager manager, ModelWire parent, int pointIndex) - { - super(3); - this.manager = manager; - this.parent = parent; - this.pointIndex = pointIndex; - setSize(END_OFFSET, END_OFFSET); - Point pathPoint = parent.getPathPoint(pointIndex); - moveTo(pathPoint.x, pathPoint.y); - } - - void updatePos() - { - Point p = parent.getPathPoint(pointIndex); - moveTo(p.x, p.y); - callRedrawListeners(); - } - - @Override - public void render(GeneralGC gc) - { - gc.setLineWidth(1.0); - gc.setForeground(Display.getDefault().getSystemColor(selected ? SWT.COLOR_YELLOW : SWT.COLOR_BLUE)); - gc.drawLine(getPosX(), getPosY(), getPosX() + END_OFFSET, getPosY() + END_OFFSET); - } - - @Override - public void reqMove(double x, double y) - { - parent.setPathPoint(new Point(x, y), pointIndex); - } - - @Override - public void onSelect() - { - selected = true; - callRedrawListeners(); - } - - @Override - public void onDeselect() - { - selected = false; - callRedrawListeners(); - } - - @Override - public void reqDelete() - { - manager.destroyWirePointHandle(parent, this); - } - - @Override - public HandleType getType() - { - return HandleType.WIRE_POINT; - } - - /** - * Sets the index of the {@link Point} within the parent {@link CoreWire}s path that is controlled by this handle - * - * @param index Index of the Point in the Wires path. - * @throws IndexOutOfBoundsException - */ - public void setIndex(int index) - { - this.pointIndex = index; - updatePos(); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java deleted file mode 100644 index ef109cdb..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java +++ /dev/null @@ -1,89 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas.ZoomedRenderer; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.Selection; -import net.mograsim.logic.model.editor.handles.Handle; - -public class BoxSelectionState extends EditorState -{ - private Point origin; - private double mX, mY; - - private final ZoomedRenderer boxRenderer = gc -> - { - if (origin != null) - { - gc.setLineWidth(0.5); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_YELLOW)); - gc.drawRectangle(origin.x, origin.y, mX - origin.x, mY - origin.y); - } - }; - - public BoxSelectionState(Editor editor, StateManager manager) - { - super(editor, manager); - } - - @Override - public void onEntry() - { - editor.gui.logicCanvas.addZoomedRenderer(boxRenderer); - editor.gui.logicCanvas.redrawThreadsafe(); - } - - @Override - public void onExit() - { - editor.gui.logicCanvas.removeZoomedRenderer(boxRenderer); - editor.gui.logicCanvas.redrawThreadsafe(); - } - - @Override - public void boxSelect() - { - manager.setState(new SelectionState(editor, manager)); - } - - @Override - public void clicked(Point clicked, int stateMask) - { - if (origin == null) - { - origin = new Point(clicked.x, clicked.y); - mX = clicked.x; - mY = clicked.y; - } else - { - Selection s = editor.getSelection(); - s.clear(); - boolean leftToRight = mX > origin.x, topToBottom = mY > origin.y; - double x = leftToRight ? origin.x : mX, y = topToBottom ? origin.y : mY, width = leftToRight ? mX - origin.x : origin.x - mX, - height = topToBottom ? mY - origin.y : origin.y - mY; - - Rectangle selected = new Rectangle(x, y, width, height); - for (Handle h : editor.handleManager.getHandles()) - { - Rectangle hBounds = h.getBounds(); - if (selected.contains(hBounds.x, hBounds.y) && selected.contains(hBounds.x + hBounds.width, hBounds.y + hBounds.height)) - { - s.add(h); - } - } - manager.setState(new SelectionState(editor, manager)); - } - } - - @Override - public void mouseMoved(double x, double y) - { - mX = x; - mY = y; - editor.gui.logicCanvas.redrawThreadsafe(); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java deleted file mode 100644 index 1c06c52e..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas.ZoomedRenderer; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.PinHandle; -import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; - -public class CreateWireState extends EditorState -{ - private final PinHandle origin; - private double mX, mY; - private ZoomedRenderer drawLine; - - public CreateWireState(Editor session, StateManager manager, PinHandle origin) - { - super(session, manager); - this.origin = origin; - mX = origin.getCenterX(); - mY = origin.getCenterY(); - } - - @Override - public void mouseMoved(double x, double y) - { - this.mX = x; - this.mY = y; - editor.gui.logicCanvas.redraw(); - } - - @Override - public void onEntry() - { - editor.getSelection().clear(); - drawLine = gc -> - { - gc.setLineWidth(1); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN)); - gc.drawLine((int) origin.getCenterX(), (int) origin.getCenterY(), (int) mX, (int) mY); - }; - editor.gui.logicCanvas.addZoomedRenderer(drawLine); - editor.gui.logicCanvas.redraw(); - } - - @Override - public void onExit() - { - editor.gui.logicCanvas.removeZoomedRenderer(drawLine); - editor.gui.logicCanvas.redraw(); - } - - @Override - public boolean clickedHandle(HandleClickInfo handleClickInfo) - { - switch (handleClickInfo.clicked.getType()) - { - case INTERFACE_PIN: - case STATIC_PIN: - try - { - editor.addWire(origin, (PinHandle) handleClickInfo.clicked); - } - catch (IllegalArgumentException e) - { - Shell tmp = new Shell(Display.getCurrent()); - editor.dialogManager.openWarningDialog("Warning!", e.getMessage()); - tmp.dispose(); - } - break; - default: - return false; - } - return true; - } - - @Override - public void clicked(Point clicked, int stateMask) - { - manager.setState(new SelectionState(editor, manager)); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java deleted file mode 100644 index 05e05d85..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.InterfacePinHandle; -import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; - -public abstract class EditorState -{ - protected final Editor editor; - protected final StateManager manager; - - public EditorState(Editor session, StateManager manager) - { - this.editor = session; - this.manager = manager; - } - - //@formatter:off - public void add() {} - public void delete() {} - public void copy() {} - public void paste() {} - public void duplicate() {} - public void grab() {} - public void mouseMoved(double x, double y) {} - public void select(Point pos, boolean additive) {} - public void boxSelect() {} - public void onEntry() {} - public void onExit() {} - public void clicked(InterfacePinHandle interfacePinHandle, int stateMask) {} - public void clickedEmpty(Point clicked, int stateMask) {} - public void clicked(Point clicked, int stateMask) {} - public boolean clickedHandle(HandleClickInfo handleClickInfo) { return false; } - //@formatter:on -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java deleted file mode 100644 index 1b8447e0..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import java.util.Map; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.Handle; - -public class GrabState extends EditorState -{ - private Map offsets; - - public GrabState(Editor editor, StateManager manager) - { - super(editor, manager); - } - - @Override - public void onEntry() - { - offsets = editor.getSelection().calculateOffsets(); - } - - @Override - public void grab() - { - manager.setState(new SelectionState(editor, manager)); - } - - @Override - public void mouseMoved(double x, double y) - { - editor.moveHandles(x, y, offsets); - } - - @Override - public void clicked(Point clicked, int stateMask) - { - manager.setState(new SelectionState(editor, manager)); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java deleted file mode 100644 index baa2eff9..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java +++ /dev/null @@ -1,186 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas.ZoomedRenderer; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.Selection; -import net.mograsim.logic.model.editor.handles.Handle; -import net.mograsim.logic.model.editor.handles.PinHandle; -import net.mograsim.logic.model.editor.handles.WireHandle; -import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; -import net.mograsim.logic.model.editor.handles.WireHandle.WireHandleClickInfo; -import net.mograsim.logic.model.editor.ui.DialogManager; -import net.mograsim.logic.model.model.wires.MovablePin; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; - -public class SelectionState extends EditorState -{ - private final ZoomedRenderer outlineRenderer = gc -> - { - if (editor.getSelection().size() > 1) - { - gc.setLineWidth(1); - gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_YELLOW)); - gc.drawRectangle(editor.getSelection().getBounds()); - } - }; - - public SelectionState(Editor editor, StateManager manager) - { - super(editor, manager); - } - - @Override - public void add() - { - Point curserPos = editor.userInput.getWorldMousePosition(); - editor.addComponent(curserPos.x, curserPos.y); - } - - @Override - public void delete() - { - editor.deleteSelection(); - } - - @Override - public void copy() - { - editor.copy(); - } - - @Override - public void paste() - { - Point curserPos = editor.userInput.getWorldMousePosition(); - editor.paste(curserPos.x, curserPos.y); - } - - @Override - public void duplicate() - { - editor.duplicate(); - } - - @Override - public void grab() - { - if (!editor.getSelection().isEmpty()) - manager.setState(new GrabState(editor, manager)); - } - - @Override - public void boxSelect() - { - manager.setState(new BoxSelectionState(editor, manager)); - } - - @Override - public void onEntry() - { - editor.gui.logicCanvas.addZoomedRenderer(outlineRenderer); - editor.gui.logicCanvas.redrawThreadsafe(); - } - - @Override - public void onExit() - { - editor.gui.logicCanvas.removeZoomedRenderer(outlineRenderer); - editor.gui.logicCanvas.redrawThreadsafe(); - } - - @Override - public void clickedEmpty(Point clicked, int stateMask) - { - editor.getSelection().clear(); - if ((stateMask & SWT.ALT) == SWT.ALT) - { - String[] result = DialogManager.openMultiTextDialog("Add Pin...", "Add", "Cancel", "Name", "Logic Width", "Usage"); - if (result != null) - { - try - { - Pin p = editor.toBeEdited.addSubmodelInterface(new MovablePin(editor.getSubmodel(), editor.toBeEdited, result[0], - Integer.parseInt(result[1]), PinUsage.valueOf(result[2]), clicked.x, clicked.y)); - editor.handleManager.getInterfacePinHandle(p).reqMove(clicked.x, clicked.y); - } - catch (NumberFormatException e) - { - editor.dialogManager.openWarningDialog("Failed to create Pin!", "Bit width must be a number!"); - } - catch (IllegalArgumentException e) - { - editor.dialogManager.openWarningDialog("Failed to create Pin!", "Usage must be one of INPUT, OUTPUT, TRISTATE!"); - } - } - } - } - - @Override - public boolean clickedHandle(HandleClickInfo handleClickInfo) - { - switch (handleClickInfo.clicked.getType()) - { - case INTERFACE_PIN: - if ((handleClickInfo.stateMask & SWT.CTRL) == SWT.CTRL) - { - manager.setState(new CreateWireState(editor, manager, (PinHandle) handleClickInfo.clicked)); - break; - } - case CORNER: - case COMPONENT: - case WIRE_POINT: - boolean additive = (handleClickInfo.stateMask & SWT.SHIFT) == SWT.SHIFT; - select(handleClickInfo.clicked, additive); - break; - case STATIC_PIN: - if ((handleClickInfo.stateMask & SWT.CTRL) == SWT.CTRL) - manager.setState(new CreateWireState(editor, manager, (PinHandle) handleClickInfo.clicked)); - else - return false; - break; - case WIRE: - if ((handleClickInfo.stateMask & SWT.CTRL) == SWT.CTRL) - { - WireHandleClickInfo info = (WireHandleClickInfo) handleClickInfo; - WireHandle clicked = (WireHandle) info.clicked; - clicked.parent.insertPathPoint(info.posOnWire, info.segment); - } else - { - additive = (handleClickInfo.stateMask & SWT.SHIFT) == SWT.SHIFT; - select(handleClickInfo.clicked, additive); - } - break; - default: - return false; - } - return true; - } - - private void select(Handle h, boolean additive) - { - Selection sel = editor.getSelection(); - if (sel.contains(h)) - if (additive) - sel.remove(h); - else - { - if (editor.getSelection().size() > 1) - { - sel.clear(); - sel.add(h); - } else - sel.clear(); - } - else - { - if (!additive) - sel.clear(); - sel.add(h); - } - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/StateManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/StateManager.java deleted file mode 100644 index d4b3fc4d..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/StateManager.java +++ /dev/null @@ -1,78 +0,0 @@ -package net.mograsim.logic.model.editor.states; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.Handle.HandleClickInfo; - -public class StateManager -{ - private EditorState state; - - public StateManager(Editor session) - { - state = new SelectionState(session, this); - state.onEntry(); - } - - public EditorState getState() - { - return state; - } - - public void setState(EditorState state) - { - this.state.onExit(); - this.state = state; - state.onEntry(); - } - - public void add() - { - state.add(); - } - - public void delete() - { - state.delete(); - } - - public void copy() - { - state.copy(); - } - - public void paste() - { - state.paste(); - } - - public void duplicate() - { - state.duplicate(); - } - - public void grab() - { - state.grab(); - } - - public void mouseMoved(double x, double y) - { - state.mouseMoved(x, y); - } - - public void select(Point pos, boolean additive) - { - state.select(pos, additive); - } - - public boolean clickedHandle(HandleClickInfo handleClickInfo) - { - return state.clickedHandle(handleClickInfo); - } - - public void boxSelect() - { - state.boxSelect(); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java deleted file mode 100644 index df7455e6..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java +++ /dev/null @@ -1,199 +0,0 @@ -package net.mograsim.logic.model.editor.ui; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Dialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - -public class DialogManager -{ - private Shell parent; - - public DialogManager(Shell parent) - { - this.parent = parent; - } - - public void openWarningDialog(String title, String message) - { - MessageBox b = new MessageBox(parent, SWT.ICON_WARNING | SWT.OK); - b.setText(title); - b.setMessage(message); - b.open(); - } - - private static abstract class FlexibleInputsDialog extends Dialog - { - private final String title, acceptLabel, cancelLabel; - - protected String[] result; - - public FlexibleInputsDialog(String title, String acceptLabel, String cancelLabel, String... inputs) - { - this(false, title, acceptLabel, cancelLabel, inputs); - } - - public FlexibleInputsDialog(boolean resizable, String title, String acceptLabel, String cancelLabel, String... inputs) - { - super(new Shell(SWT.CLOSE | (resizable ? SWT.RESIZE | SWT.MAX : 0) | SWT.TITLE | SWT.MIN | SWT.ON_TOP | SWT.APPLICATION_MODAL)); - this.title = title; - this.acceptLabel = acceptLabel; - this.cancelLabel = cancelLabel; - } - - protected abstract void setupWidgets(Composite parent); - - protected abstract void buildResult(); - - /** - * @return May be null (if {@link Dialog} was cancelled) - */ - public String[] open() - { - Shell shell = getParent(); - Display display = shell.getDisplay(); - shell.setMinimumSize(500, 150); - shell.setText(title); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - shell.setLayout(layout); - - Composite inputContainer = new Composite(shell, SWT.BORDER); - GridData gd = new GridData(); - gd.horizontalSpan = 2; - gd.horizontalAlignment = SWT.FILL; - gd.grabExcessHorizontalSpace = true; - gd.verticalAlignment = SWT.FILL; - gd.grabExcessVerticalSpace = true; - inputContainer.setLayoutData(gd); - setupWidgets(inputContainer); - - Button b1 = new Button(shell, SWT.PUSH); - b1.addListener(SWT.Selection, e -> - { - buildResult(); - shell.dispose(); - }); - - b1.setText(acceptLabel); - Button b2 = new Button(shell, SWT.PUSH); - b2.addListener(SWT.Selection, e -> - { - shell.dispose(); - }); - b2.setText(cancelLabel); - - shell.pack(); - - shell.open(); - while (!shell.isDisposed()) - if (!display.readAndDispatch()) - display.sleep(); - return result; - } - } - - private static class MultiTextFieldsDialog extends FlexibleInputsDialog - { - private final String[] inputs; - private Text[] textFields; - - public MultiTextFieldsDialog(String title, String acceptLabel, String cancelLabel, String... inputs) - { - super(title, acceptLabel, cancelLabel); - this.inputs = inputs; - } - - @Override - protected void setupWidgets(Composite parent) - { - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - parent.setLayout(layout); - this.textFields = new Text[inputs.length]; - for (int i = 0; i < inputs.length; i++) - { - Label textFieldName = new Label(parent, SWT.NONE); - textFieldName.setText(inputs[i].concat(":")); - GridData g = new GridData(); - g.grabExcessHorizontalSpace = true; - g.horizontalAlignment = SWT.FILL; - Text newTextField = new Text(parent, SWT.BORDER); - newTextField.setLayoutData(g); - textFields[i] = newTextField; - } - } - - @Override - protected void buildResult() - { - result = new String[textFields.length]; - for (int i = 0; i < textFields.length; i++) - result[i] = textFields[i].getText(); - } - - } - - /** - * @return The Strings entered, in order of the input labels the dialog was opened with, if the dialog was accepted, null if the dialog - * was cancelled. - */ - public static String[] openMultiTextDialog(String title, String acceptLabel, String cancelLabel, String... inputs) - { - return new MultiTextFieldsDialog(title, acceptLabel, cancelLabel, inputs).open(); - } - - public static class MultiLineTextFieldDialog extends FlexibleInputsDialog - { - private final String input; - private Text textField; - - public MultiLineTextFieldDialog(String title, String acceptLabel, String cancelLabel, String input) - { - super(true, title, acceptLabel, cancelLabel); - this.input = input; - } - - @Override - protected void setupWidgets(Composite parent) - { - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - parent.setLayout(layout); - GridData gd = new GridData(); - Label l = new Label(parent, SWT.NONE); - l.setText(input); - gd.verticalAlignment = SWT.TOP; - l.setLayoutData(gd); - gd = new GridData(); - textField = new Text(parent, SWT.V_SCROLL); - textField.setLayoutData(gd); - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = true; - gd.horizontalAlignment = SWT.FILL; - gd.verticalAlignment = SWT.FILL; - } - - @Override - protected void buildResult() - { - result = new String[] { textField.getText() }; - } - } - - /** - * @return The String entered if the dialog was accepted, null if the dialog was cancelled. - */ - public static String openMultiLineTextDialog(String title, String acceptLabel, String cancelLabel, String input) - { - String[] result = new MultiLineTextFieldDialog(title, acceptLabel, cancelLabel, input).open(); - return result == null ? null : result[0]; - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java deleted file mode 100644 index aedaa481..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.mograsim.logic.model.editor.ui; - -import java.util.Collection; - -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.widgets.Composite; - -import net.haspamelodica.swt.helper.gcs.TranslatedGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.LogicUICanvas; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.handles.Handle; -import net.mograsim.preferences.Preferences; - -//TODO: Remove Inheritance -public class EditorCanvas extends LogicUICanvas -{ - private Collection handles; - - public EditorCanvas(Composite parent, int style, Editor editor) - { - super(parent, style, editor.toBeEdited.submodel); - - handles = editor.handleManager.getHandles(); - editor.handleManager.addHandleAddedListener(h -> - { - redrawThreadsafe(); - h.addRedrawListener(this::redrawThreadsafe); - }); - // TODO: Is this even necessary? The Handle should be finalized by the gc - editor.handleManager.addHandleRemovedListener(h -> - { - redrawThreadsafe(); - h.removeRedrawListener(this::redrawThreadsafe); - }); - - addZoomedRenderer(gc -> - { - Rectangle visibleRegion = new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom); - Color background = Preferences.current().getColor("net.mograsim.logic.model.color.background"); - if (background != null) - setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the - // canvas - - TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false); - editor.toBeEdited.getOutlineRenderer().render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom)); - - handles.forEach(h -> h.render(gc, visibleRegion)); - }); - } -} diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java deleted file mode 100644 index 17e12ebb..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java +++ /dev/null @@ -1,232 +0,0 @@ -package net.mograsim.logic.model.editor.ui; - -import java.io.IOException; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.List; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.swt.widgets.ToolItem; - -import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay; -import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput; -import net.mograsim.logic.model.editor.Editor; -import net.mograsim.logic.model.editor.SaveLoadManager; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class EditorGUI -{ - public final Display display; - public final Shell shell; - public final EditorCanvas logicCanvas; - private final List addList; - private final Editor editor; - - public EditorGUI(Editor editor) - { - this.editor = editor; - display = Display.getDefault(); - shell = new Shell(display); - - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - shell.setLayout(layout); - - setupTopToolBar(shell); - Composite innerComp = new Composite(shell, SWT.NONE); - GridData innerCompData = new GridData(); - innerCompData.grabExcessHorizontalSpace = true; - innerCompData.grabExcessVerticalSpace = true; - innerCompData.horizontalAlignment = SWT.FILL; - innerCompData.verticalAlignment = SWT.FILL; - innerComp.setLayoutData(innerCompData); - - GridLayout innerLayout = new GridLayout(); - innerComp.setLayout(innerLayout); - innerLayout.numColumns = 2; - - GridData d = new GridData(); - d.grabExcessHorizontalSpace = true; - d.horizontalAlignment = SWT.FILL; - d.grabExcessVerticalSpace = true; - d.verticalAlignment = SWT.FILL; - - logicCanvas = new EditorCanvas(innerComp, SWT.TRAIL, editor); - logicCanvas.setLayoutData(d); - - d = new GridData(); - d.grabExcessVerticalSpace = true; - d.verticalAlignment = SWT.FILL; - d.verticalSpan = 2; - addList = new List(innerComp, SWT.V_SCROLL); - addList.setLayoutData(d); - refreshAddList(); - - setupBottomToolBar(innerComp); - - ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(logicCanvas); - userInput.buttonDrag = 3; - userInput.buttonZoom = 2; - userInput.enableUserInput(); - new ZoomableCanvasOverlay(logicCanvas, null).enableScale(); - } - - private ToolBar setupTopToolBar(Composite parent) - { - GridData d = new GridData(); - d.grabExcessHorizontalSpace = true; - d.horizontalAlignment = SWT.FILL; - - ToolBar toolBar = new ToolBar(parent, SWT.BORDER); - toolBar.setLayoutData(d); - - ToolItem file = new ToolItem(toolBar, SWT.DROP_DOWN); - - // TODO - DropDownEntry newEntry = new DropDownEntry("New", e -> Editor.openNewEditor()); - DropDownEntry loadEntry = new DropDownEntry("Load", e -> - { - try - { - SaveLoadManager.openLoadDialog(); - } - catch (IOException e1) - { - editor.dialogManager.openWarningDialog("Failed to load Component!", e1.getMessage()); - } - }); - DropDownEntry saveEntry = new DropDownEntry("Save", e -> editor.save()); - DropDownEntry saveAsEntry = new DropDownEntry("Save as...", e -> editor.saveAs()); - - DropDownEntry[] entries = new DropDownEntry[] { newEntry, loadEntry, saveEntry, saveAsEntry }; - - setupDrowpDownMenu(file, entries); - - file.setText("File"); - return toolBar; - } - - private ToolBar setupBottomToolBar(Composite parent) - { - GridData d = new GridData(); - d.grabExcessHorizontalSpace = true; - d.horizontalAlignment = SWT.FILL; - - ToolBar toolBar = new ToolBar(parent, SWT.BORDER); - toolBar.setLayoutData(d); - - ToolItem snappingLabel = new ToolItem(toolBar, SWT.NONE); - snappingLabel.setText("Snapping:"); - - ToolItem snappSelect = new ToolItem(toolBar, SWT.DROP_DOWN); - DropDownEntry[] entries = new DropDownEntry[Editor.Snapping.values().length]; - int index = 0; - for (Editor.Snapping sn : Editor.Snapping.values()) - { - entries[index++] = new DropDownEntry(sn.toString(), e -> - { - editor.setSnapping(sn); - snappSelect.setText(sn.toString()); - }); - } - snappSelect.setText(editor.getSnapping().toString()); - setupDrowpDownMenu(snappSelect, entries); - - new ToolItem(toolBar, SWT.SEPARATOR); - - toolBar.pack(); - - return toolBar; - } - - private void setupDrowpDownMenu(ToolItem parent, DropDownEntry[] entries) - { - Menu menu = new Menu(shell, SWT.POP_UP); - for (DropDownEntry entry : entries) - { - MenuItem item = new MenuItem(menu, SWT.PUSH); - item.addSelectionListener(new SelectionListener() - { - @Override - public void widgetSelected(SelectionEvent e) - { - entry.listener.widgetSelected(e); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) - { - widgetSelected(e); - } - }); - item.setText(entry.title); - } - - parent.addListener(SWT.Selection, new Listener() - { - public void handleEvent(Event event) - { - if (event.detail == SWT.ARROW) - { - Rectangle rect = parent.getBounds(); - Point pt = new Point(rect.x, rect.y + rect.height); - pt = parent.getParent().toDisplay(pt); - menu.setLocation(pt.x, pt.y); - menu.setVisible(true); - } - } - }); - } - - private static class DropDownEntry - { - public final String title; - public final EntrySelectedListener listener; - - public DropDownEntry(String title, EntrySelectedListener listener) - { - super(); - this.title = title; - this.listener = listener; - } - } - - private static interface EntrySelectedListener - { - public void widgetSelected(SelectionEvent e); - } - - public void refreshAddList() - { - addList.setItems(IndirectModelComponentCreator.getStandardComponentIDs().keySet().stream().sorted().toArray(String[]::new)); - addList.select(0); - } - - public String getAddListSelected() - { - String[] selection = addList.getSelection(); - if (selection.length == 0) - throw new IllegalStateException("Selection in the Add Component List may never be empty!"); - return selection[0]; - } - - public void open() - { - shell.open(); - while (!shell.isDisposed()) - if (!display.readAndDispatch()) - display.sleep(); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/util/PrioritySet.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/util/PrioritySet.java deleted file mode 100644 index 253dfdd3..00000000 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/util/PrioritySet.java +++ /dev/null @@ -1,98 +0,0 @@ -package net.mograsim.logic.model.editor.util; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.Set; - -/** - * Similar to a SortedSet, except it is allowed for multiple elements to have the same priority (c.compare(e1, e2) == 0 is - * allowed to be true for two different elements e1 and e2). However, to elements are not allowed to be equal according to - * Object.equals(Object o). - * - * @author Fabian Stemmler - * - * @param the type of elements in this list - */ -public class PrioritySet implements Set -{ - private ArrayList list; - private Comparator c; - - public PrioritySet(Comparator c) - { - setComparator(c); - list = new ArrayList<>(); - } - - @SuppressWarnings("unchecked") - public PrioritySet() - { - this((e1, e2) -> ((Comparable) e1).compareTo(e2)); - } - - public void setComparator(Comparator c) - { - this.c = c; - } - - //@formatter:off - @Override - public int size() { return list.size(); } - @Override - public boolean isEmpty() { return list.isEmpty(); } - @Override - public boolean contains(Object o) { return list.isEmpty(); } - @Override - public Iterator iterator() { return list.iterator(); } - @Override - public Object[] toArray() { return list.toArray(); } - @Override - public E[] toArray(E[] a) { return list.toArray(a); } - @Override - public boolean remove(Object o) { return list.remove(o); } - @Override - public boolean containsAll(Collection c) { return list.containsAll(c); } - @Override - public boolean removeAll(Collection c) { return list.removeAll(c); } - @Override - public boolean retainAll(Collection c) { return list.retainAll(c); } - @Override - public void clear() { list.clear(); } - //@formatter:on - - @Override - public boolean add(T e) - { - if (isEmpty()) - { - list.add(e); - return true; - } - int index = Collections.binarySearch(list, e, c); - if (index < 0) - index = -index - 1; - if (index < size()) - { - if (list.get(index).equals(e)) - return false; - list.add(index, e); - } else - list.add(e); - return true; - } - - @Override - public boolean addAll(Collection c) - { - return c.stream().map(e -> add(e)).reduce(false, (a, b) -> a || b); - } - - @Override - public String toString() - { - return list.toString(); - } -} diff --git a/net.mograsim.logic.model/.classpath b/net.mograsim.logic.model/.classpath deleted file mode 100644 index 4a00becd..00000000 --- a/net.mograsim.logic.model/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/net.mograsim.logic.model/.gitignore b/net.mograsim.logic.model/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/net.mograsim.logic.model/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/net.mograsim.logic.model/.project b/net.mograsim.logic.model/.project deleted file mode 100644 index c6d10606..00000000 --- a/net.mograsim.logic.model/.project +++ /dev/null @@ -1,30 +0,0 @@ - - - net.mograsim.logic.model - - - net.mograsim.logic.core - SWTZoomableCanvas - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/net.mograsim.logic.model/.settings/org.eclipse.core.resources.prefs b/net.mograsim.logic.model/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/net.mograsim.logic.model/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/net.mograsim.logic.model/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.logic.model/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f8bd225a..00000000 --- a/net.mograsim.logic.model/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,456 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=info -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=info -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=140 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=140 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/net.mograsim.logic.model/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.logic.model/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 8f2c0a47..00000000 --- a/net.mograsim.logic.model/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,63 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_MoGraSim -formatter_settings_version=16 -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/net.mograsim.logic.model/META-INF/MANIFEST.MF b/net.mograsim.logic.model/META-INF/MANIFEST.MF deleted file mode 100644 index e6b077ab..00000000 --- a/net.mograsim.logic.model/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-SymbolicName: net.mograsim.logic.model;singleton:=true -Bundle-Version: 0.1.0.qualifier -Export-Package: net.mograsim.logic.model, - net.mograsim.logic.model.examples, - net.mograsim.logic.model.model, - net.mograsim.logic.model.model.components, - net.mograsim.logic.model.model.components.atomic, - net.mograsim.logic.model.model.components.submodels, - net.mograsim.logic.model.model.wires, - net.mograsim.logic.model.modeladapter, - net.mograsim.logic.model.modeladapter.componentadapters, - net.mograsim.logic.model.serializing, - net.mograsim.logic.model.snippets, - net.mograsim.logic.model.snippets.highlevelstatehandlers, - net.mograsim.logic.model.snippets.highlevelstatehandlers.standard, - net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic, - net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent, - net.mograsim.logic.model.snippets.outlinerenderers, - net.mograsim.logic.model.snippets.symbolrenderers, - net.mograsim.logic.model.util -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt;bundle-version="3.0.0";visibility:=reexport, - SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport, - net.mograsim.logic.core;bundle-version="0.1.0";visibility:=reexport, - com.google.gson;bundle-version="2.8.2";visibility:=reexport, - net.mograsim.preferences;bundle-version="0.1.0" -Automatic-Module-Name: net.mograsim.logic.model -Bundle-Vendor: Mograsim Team diff --git a/net.mograsim.logic.model/OSGI-INF/l10n/bundle.properties b/net.mograsim.logic.model/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index fad36e3e..00000000 --- a/net.mograsim.logic.model/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for net.mograsim.logic.model -Bundle-Vendor = Mograsim Team -Bundle-Name = Mograsim logic model and user interface \ No newline at end of file diff --git a/net.mograsim.logic.model/build.properties b/net.mograsim.logic.model/build.properties deleted file mode 100644 index d6642e65..00000000 --- a/net.mograsim.logic.model/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/ diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java deleted file mode 100644 index a9fde7a1..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java +++ /dev/null @@ -1,111 +0,0 @@ -package net.mograsim.logic.model; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -import net.mograsim.logic.core.timeline.Timeline; - -//TODO maybe move to logic core? -public class LogicExecuter -{ - // TODO replace with CoreModel when it exists - private final Timeline timeline; - - private final AtomicBoolean shouldBeRunningLive; - private final AtomicBoolean isRunningLive; - private final AtomicLong nextExecSimulTime; - private final Thread simulationThread; - - public LogicExecuter(Timeline timeline) - { - this.timeline = timeline; - - timeline.setTimeFunction(System::currentTimeMillis); - shouldBeRunningLive = new AtomicBoolean(); - isRunningLive = new AtomicBoolean(); - nextExecSimulTime = new AtomicLong(); - simulationThread = new Thread(() -> - { - isRunningLive.set(true); - synchronized (isRunningLive) - { - isRunningLive.notify(); - } - try - { - while (shouldBeRunningLive.get()) - { - // always execute to keep timeline from "hanging behind" for too long - long current = System.currentTimeMillis(); - timeline.executeUntil(timeline.laterThan(current), current + 10); - long sleepTime; - if (timeline.hasNext()) - sleepTime = timeline.nextEventTime() - current; - else - sleepTime = 10000; - try - { - nextExecSimulTime.set(current + sleepTime); - if (sleepTime > 0) - Thread.sleep(sleepTime); - } - catch (@SuppressWarnings("unused") InterruptedException e) - {// do nothing; it is normal execution flow to be interrupted - } - } - } - finally - { - isRunningLive.set(false); - synchronized (isRunningLive) - { - isRunningLive.notify(); - } - } - }); - timeline.addEventAddedListener(event -> - { - if (isRunningLive.get()) - if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0) - simulationThread.interrupt(); - }); - } - - public void executeNextStep() - { - timeline.executeNext(); - } - - public synchronized void startLiveExecution() - { - if (shouldBeRunningLive.get()) - return; - shouldBeRunningLive.set(true); - simulationThread.start(); - waitForIsRunning(true); - } - - public synchronized void stopLiveExecution() - { - if (!shouldBeRunningLive.get()) - return; - shouldBeRunningLive.set(false); - simulationThread.interrupt(); - waitForIsRunning(false); - } - - private void waitForIsRunning(boolean expectedState) - { - while (isRunningLive.get() ^ expectedState) - try - { - synchronized (isRunningLive) - { - isRunningLive.wait(); - } - } - catch (@SuppressWarnings("unused") InterruptedException e) - {// no need to do anything - } - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java deleted file mode 100644 index 15346c63..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java +++ /dev/null @@ -1,239 +0,0 @@ -package net.mograsim.logic.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.model.model.LogicModel; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; -import net.mograsim.preferences.Preferences; - -/** - * Simulation visualizer canvas. - * - * @author Daniel Kirschten - */ -public class LogicUICanvas extends ZoomableCanvas -{ - private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL = false; - - private final LogicModel model; - - public LogicUICanvas(Composite parent, int style, LogicModel model) - { - super(parent, style, Preferences.current().getBoolean("net.mograsim.logic.model.improvetext")); - - this.model = model; - - LogicUIRenderer renderer = new LogicUIRenderer(model); - addZoomedRenderer(gc -> - { - Color background = Preferences.current().getColor("net.mograsim.logic.model.color.background"); - if (background != null) - setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the canvas - renderer.render(gc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom)); - }); - model.setRedrawHandler(this::redrawThreadsafe); - - addListener(SWT.MouseDown, this::mouseDown); - - if (OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL) - openDebugSetHighLevelStateShell(model); - } - - private void mouseDown(Event e) - { - if (e.button == 1) - { - Point click = canvasToWorldCoords(e.x, e.y); - for (ModelComponent component : model.getComponentsByName().values()) - if (component.getBounds().contains(click) && component.clicked(click.x, click.y)) - { - redraw(); - break; - } - } - } - - private void openDebugSetHighLevelStateShell(LogicModel model) - { - Shell debugShell = new Shell(); - debugShell.setLayout(new GridLayout(2, false)); - new Label(debugShell, SWT.NONE).setText("Target component: "); - Combo componentSelector = new Combo(debugShell, SWT.DROP_DOWN | SWT.READ_ONLY); - componentSelector.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - List componentsByItemIndex = new ArrayList<>(); - List models = new ArrayList<>(); - AtomicBoolean recalculateQueued = new AtomicBoolean(); - AtomicReference> compAdded = new AtomicReference<>(); - AtomicReference> compRemoved = new AtomicReference<>(); - compAdded.set(c -> compsChanged(compAdded.get(), compRemoved.get(), c, models, componentsByItemIndex, componentSelector, model, - recalculateQueued, true)); - compRemoved.set(c -> compsChanged(compAdded.get(), compRemoved.get(), c, models, componentsByItemIndex, componentSelector, model, - recalculateQueued, false)); - iterateModelTree(compAdded.get(), compRemoved.get(), model, models, true); - debugShell.addListener(SWT.Dispose, e -> models.forEach(m -> - { - m.removeComponentAddedListener(compAdded.get()); - m.removeComponentRemovedListener(compRemoved.get()); - })); - queueRecalculateComponentSelector(recalculateQueued, componentsByItemIndex, componentSelector, model); - new Label(debugShell, SWT.NONE).setText("Target state ID: "); - Text stateIDText = new Text(debugShell, SWT.SINGLE | SWT.LEAD | SWT.BORDER); - stateIDText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - new Label(debugShell, SWT.NONE).setText("Value type: "); - Composite radioGroup = new Composite(debugShell, SWT.NONE); - radioGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - GridLayout radioGroupLayout = new GridLayout(2, false); - radioGroupLayout.marginHeight = 0; - radioGroupLayout.marginWidth = 0; - radioGroup.setLayout(radioGroupLayout); - Button radioBit = new Button(radioGroup, SWT.RADIO); - radioBit.setText("Single bit"); - Button radioBitVector = new Button(radioGroup, SWT.RADIO); - radioBitVector.setText("Bitvector"); - new Label(debugShell, SWT.NONE).setText("Value string representation: \n(Bit vectors: MSBit...LSBit)"); - Text valueText = new Text(debugShell, SWT.SINGLE | SWT.LEAD | SWT.BORDER); - valueText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - Button send = new Button(debugShell, SWT.PUSH); - send.setText("Send!"); - Button get = new Button(debugShell, SWT.PUSH); - get.setText("Get!"); - Text output = new Text(debugShell, SWT.READ_ONLY); - output.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); - Listener sendAction = e -> - { - try - { - int componentIndex = componentSelector.getSelectionIndex(); - if (componentIndex < 0 || componentIndex >= componentsByItemIndex.size()) - throw new RuntimeException("No component selected"); - ModelComponent target = componentsByItemIndex.get(componentIndex); - String valueString = valueText.getText(); - Object value; - if (radioBit.getSelection()) - value = Bit.parse(valueString); - else if (radioBitVector.getSelection()) - value = BitVector.parse(valueString); - else - throw new RuntimeException("No value type selected"); - target.setHighLevelState(stateIDText.getText(), value); - output.setText("Success!"); - } - catch (Exception x) - { - output.setText(x.getClass().getSimpleName() + (x.getMessage() == null ? "" : ": " + x.getMessage())); - } - }; - Listener getAction = e -> - { - try - { - if (componentSelector.getSelectionIndex() >= componentsByItemIndex.size()) - throw new RuntimeException("No valid component selected"); - output.setText("Success! Value: \r\n" - + componentsByItemIndex.get(componentSelector.getSelectionIndex()).getHighLevelState(stateIDText.getText())); - } - catch (Exception x) - { - output.setText(x.getClass().getSimpleName() + (x.getMessage() == null ? "" : ": " + x.getMessage())); - } - }; - send.addListener(SWT.Selection, sendAction); - valueText.addListener(SWT.DefaultSelection, sendAction); - get.addListener(SWT.Selection, getAction); - stateIDText.addListener(SWT.DefaultSelection, getAction); - debugShell.open(); - } - - private void compsChanged(Consumer compAdded, Consumer compRemoved, ModelComponent c, - List models, List componentsByItemIndex, Combo componentSelector, LogicModel model, - AtomicBoolean recalculateQueued, boolean add) - { - iterateSubmodelTree(compAdded, compRemoved, c, models, add); - queueRecalculateComponentSelector(recalculateQueued, componentsByItemIndex, componentSelector, model); - } - - private void iterateSubmodelTree(Consumer compAdded, Consumer compRemoved, - ModelComponent c, List models, boolean add) - { - if (c instanceof SubmodelComponent) - iterateModelTree(compAdded, compRemoved, ((SubmodelComponent) c).submodel, models, add); - } - - private void iterateModelTree(Consumer compAdded, Consumer compRemoved, - LogicModel model, List models, boolean add) - { - if (add ^ models.contains(model)) - { - if (add) - { - models.add(model); - model.addComponentAddedListener(compAdded); - model.addComponentRemovedListener(compRemoved); - } else - { - models.remove(model); - model.removeComponentAddedListener(compAdded); - model.removeComponentRemovedListener(compRemoved); - } - for (ModelComponent c : model.getComponentsByName().values()) - iterateSubmodelTree(compAdded, compRemoved, c, models, add); - } - } - - private void queueRecalculateComponentSelector(AtomicBoolean recalculateQueued, List componentsByItemIndex, - Combo componentSelector, LogicModel model) - { - if (recalculateQueued.compareAndSet(false, true)) - getDisplay().asyncExec(() -> recalculateComponentSelector(recalculateQueued, componentsByItemIndex, componentSelector, model)); - } - - private void recalculateComponentSelector(AtomicBoolean recalculateQueued, List componentsByItemIndex, - Combo componentSelector, LogicModel model) - { - recalculateQueued.set(false); - componentsByItemIndex.clear(); - componentSelector.setItems(); - addComponentSelectorItems(componentsByItemIndex, "", componentSelector, model); - } - - private void addComponentSelectorItems(List componentsByItemIndex, String base, Combo componentSelector, - LogicModel model) - { - model.getComponentsByName().values().stream().sorted((c1, c2) -> c1.getName().compareTo(c2.getName())).forEach(c -> - { - if (!(c instanceof ModelWireCrossPoint || c instanceof SubmodelInterface)) - { - String item = base + c.getName(); - componentsByItemIndex.add(c); - componentSelector.add(item); - if (c instanceof SubmodelComponent) - addComponentSelectorItems(componentsByItemIndex, item + " -> ", componentSelector, ((SubmodelComponent) c).submodel); - } - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java deleted file mode 100644 index 1df2f7b7..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java +++ /dev/null @@ -1,58 +0,0 @@ -package net.mograsim.logic.model; - -import org.eclipse.swt.SWT; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.LogicModel; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.preferences.Preferences; - -public class LogicUIRenderer -{ - private static final boolean DRAW_PINS = false; - - private final LogicModel model; - - public LogicUIRenderer(LogicModel model) - { - this.model = model; - } - - public void render(GeneralGC gc, Rectangle visibleRegion) - { - gc.setAntialias(SWT.ON); - gc.setClipping(visibleRegion); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default")); - model.getWiresByName().values().forEach(w -> - { - Rectangle bounds = w.getBounds(); - double lw = gc.getLineWidth(); - if (visibleRegion.intersects(bounds.x - lw, bounds.y - lw, bounds.width + lw + lw, bounds.height + lw + lw)) - w.render(gc); - }); - model.getComponentsByName().values().forEach(c -> renderComponent(gc, c, visibleRegion)); - } - - private static void renderComponent(GeneralGC gc, ModelComponent component, Rectangle visibleRegion) - { - Rectangle bounds = component.getBounds(); - double lw = gc.getLineWidth(); - if (visibleRegion.intersects(bounds.x - lw, bounds.y - lw, bounds.width + lw + lw, bounds.height + lw + lw)) - { - component.render(gc, visibleRegion); - if (DRAW_PINS) - { - gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_DARK_CYAN)); - for (Pin p : component.getPins().values()) - { - Point pos = p.getPos(); - gc.fillOval(pos.x - 1, pos.y - 1, 2, 2); - } - } - } - } - -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIStandaloneGUI.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIStandaloneGUI.java deleted file mode 100644 index 49182d66..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIStandaloneGUI.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.mograsim.logic.model; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; - -import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay; -import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput; -import net.mograsim.logic.model.model.LogicModel; - -/** - * Standalone simulation visualizer graphical user interface. - * - * @author Daniel Kirschten - */ -public class LogicUIStandaloneGUI implements Runnable -{ - private final Display display; - private final Shell shell; - private final LogicUICanvas ui; - - public LogicUIStandaloneGUI(LogicModel model) - { - display = new Display(); - shell = new Shell(display); - shell.setLayout(new FillLayout()); - ui = new LogicUICanvas(shell, SWT.NONE, model); - - ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(ui); - userInput.buttonDrag = 3; - userInput.buttonZoom = 2; - userInput.enableUserInput(); - new ZoomableCanvasOverlay(ui, null).enableScale(); - } - - public LogicUICanvas getLogicUICanvas() - { - return ui; - } - - /** - * Opens the UI shell. Returns when the shell is closed. - */ - @Override - public void run() - { - shell.open(); - while (!shell.isDisposed()) - if (!display.readAndDispatch()) - display.sleep(); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java deleted file mode 100644 index 03d0335c..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/SimpleLogicUIStandalone.java +++ /dev/null @@ -1,73 +0,0 @@ -package net.mograsim.logic.model; - -import java.util.function.Consumer; - -import net.mograsim.logic.core.timeline.Timeline; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.CoreModelParameters; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; - -public class SimpleLogicUIStandalone -{ - public static void executeVisualisation(Consumer setupLogicModel) - { - executeVisualisation(setupLogicModel, (Consumer) null); - } - - public static void executeVisualisation(Consumer setupLogicModel, Consumer beforeRun) - { - CoreModelParameters params = new CoreModelParameters(); - params.gateProcessTime = 50; - params.wireTravelTime = 10; - executeVisualisation(setupLogicModel, params, beforeRun); - } - - public static void executeVisualisation(Consumer setupLogicModel, CoreModelParameters params) - { - executeVisualisation(setupLogicModel, params, null); - } - - public static void executeVisualisation(Consumer setupLogicModel, CoreModelParameters params, - Consumer beforeRun) - { - // setup logic model - LogicModelModifiable logicModel = new LogicModelModifiable(); - setupLogicModel.accept(logicModel); - - // convert to core model - Timeline timeline = LogicCoreAdapter.convert(logicModel, params); - - // initialize UI and executer - LogicUIStandaloneGUI ui = new LogicUIStandaloneGUI(logicModel); - LogicExecuter exec = new LogicExecuter(timeline); - - if (beforeRun != null) - beforeRun.accept(new VisualisationObjects(logicModel, timeline, ui, exec)); - - // run it - exec.startLiveExecution(); - ui.run(); - exec.stopLiveExecution(); - } - - public static class VisualisationObjects - { - public final LogicModelModifiable model; - public final Timeline timeline; - public final LogicUIStandaloneGUI gui; - public final LogicExecuter executer; - - public VisualisationObjects(LogicModelModifiable model, Timeline timeline, LogicUIStandaloneGUI gui, LogicExecuter executer) - { - this.model = model; - this.timeline = timeline; - this.gui = gui; - this.executer = executer; - } - } - - private SimpleLogicUIStandalone() - { - throw new UnsupportedOperationException("No SimpleLogicUIStandalone instances"); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java deleted file mode 100644 index 14073bd1..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.mograsim.logic.model.examples; - -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.components.submodels.SimpleRectangularSubmodelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; - -public class ClickableSubmodelComponentsTest -{ - public static void main(String[] args) - { - SimpleLogicUIStandalone.executeVisualisation(ClickableSubmodelComponentsTest::createExample); - } - - public static void createExample(LogicModelModifiable model) - { - @SuppressWarnings("unused") // Wire - SimpleRectangularSubmodelComponent comp = new SimpleRectangularSubmodelComponent(model, 1, "") - { - { - setSubmodelScale(.4); - setOutputPins("O0"); - - ModelManualSwitch sw = new ModelManualSwitch(submodelModifiable, 1); - ModelBitDisplay bd = new ModelBitDisplay(submodelModifiable, 1); - - sw.moveTo(10, 5); - bd.moveTo(50, 5); - - new ModelWire(submodelModifiable, sw.getOutputPin(), bd.getInputPin()); - - } - }; - comp.moveTo(10, 10); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java deleted file mode 100644 index 5f68c9cc..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java +++ /dev/null @@ -1,61 +0,0 @@ -package net.mograsim.logic.model.examples; - -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; -import net.mograsim.logic.model.model.components.atomic.ModelNotGate; -import net.mograsim.logic.model.model.components.atomic.ModelOrGate; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; - -public class RSLatchExample -{ - public static void main(String[] args) - { - SimpleLogicUIStandalone.executeVisualisation(RSLatchExample::createRSLatchExample); - } - - @SuppressWarnings("unused") // for Wires being created - public static void createRSLatchExample(LogicModelModifiable model) - { - ModelManualSwitch rIn = new ModelManualSwitch(model, 1); - rIn.moveTo(100, 100); - ModelManualSwitch sIn = new ModelManualSwitch(model, 1); - sIn.moveTo(100, 200); - - ModelOrGate or1 = new ModelOrGate(model, 1); - or1.moveTo(160, 102.5); - new ModelWire(model, rIn.getOutputPin(), or1.getPin("A")); - - ModelOrGate or2 = new ModelOrGate(model, 1); - or2.moveTo(160, 192.5); - new ModelWire(model, sIn.getOutputPin(), or2.getPin("B")); - - ModelNotGate not1 = new ModelNotGate(model, 1); - not1.moveTo(200, 107.5); - new ModelWire(model, or1.getPin("Y"), not1.getPin("A")); - - ModelNotGate not2 = new ModelNotGate(model, 1); - not2.moveTo(200, 197.5); - new ModelWire(model, or2.getPin("Y"), not2.getPin("A")); - - ModelWireCrossPoint p1 = new ModelWireCrossPoint(model, 1); - p1.moveCenterTo(250, 112.5); - new ModelWire(model, not1.getPin("Y"), p1); - new ModelWire(model, p1, or2.getPin("A"), new Point(250, 130), new Point(140, 185), new Point(140, 197.5)); - - ModelWireCrossPoint p2 = new ModelWireCrossPoint(model, 1); - p2.moveCenterTo(250, 202.5); - new ModelWire(model, not2.getPin("Y"), p2); - new ModelWire(model, p2, or1.getPin("B"), new Point(250, 185), new Point(140, 130), new Point(140, 117.5)); - - ModelWireCrossPoint o1 = new ModelWireCrossPoint(model, 1); - o1.moveCenterTo(270, 112.5); - new ModelWire(model, p1, o1); - - ModelWireCrossPoint o2 = new ModelWireCrossPoint(model, 1); - o2.moveCenterTo(270, 202.5); - new ModelWire(model, p2, o2); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java deleted file mode 100644 index 17d0a44e..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java +++ /dev/null @@ -1,196 +0,0 @@ -package net.mograsim.logic.model.model; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; - -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; - -public class LogicModel -{ - private final Map components; - private final Map componentDestroyFunctions; - private final Map componentsUnmodifiable; - private final Map wires; - private final Map wireDestroyFunctions; - private final Map wiresUnmodifiable; - - private final List> componentAddedListeners; - private final List> componentRemovedListeners; - private final List> wireAddedListeners; - private final List> wireRemovedListeners; - private final List> redrawHandlerChangedListeners; - - private Runnable redrawHandler; - - protected LogicModel() - { - components = new HashMap<>(); - componentDestroyFunctions = new HashMap<>(); - componentsUnmodifiable = Collections.unmodifiableMap(components); - wires = new HashMap<>(); - wireDestroyFunctions = new HashMap<>(); - wiresUnmodifiable = Collections.unmodifiableMap(wires); - - componentAddedListeners = new ArrayList<>(); - componentRemovedListeners = new ArrayList<>(); - wireAddedListeners = new ArrayList<>(); - wireRemovedListeners = new ArrayList<>(); - redrawHandlerChangedListeners = new ArrayList<>(); - } - - /** - * Adds the given component to the list of components and calls all componentAddedListeners. Don't call this method from application - * code as it is automatically called in {@link ModelComponent}'s constructor. - * - * @author Daniel Kirschten - */ - protected void componentCreated(ModelComponent component, Runnable destroyed) - { - if (components.containsKey(component.getName())) - throw new IllegalStateException("Don't add the same component twice!"); - components.put(component.getName(), component); - componentDestroyFunctions.put(component.getName(), destroyed); - callComponentAddedListeners(component); - requestRedraw(); - } - - /** - * Destroyes the given component, removes it from the list of components and calls all componentRemovedListeners. - * - * @author Daniel Kirschten - */ - protected void destroyComponent(ModelComponent component) - { - componentDestroyFunctions.get(component.getName()).run(); - if (!components.containsKey(component.getName())) - throw new IllegalStateException("Don't remove the same component twice!"); - components.remove(component.getName()); - callComponentRemovedListeners(component); - requestRedraw(); - } - - /** - * Adds the given wire to the list of wires and calls all wireAddedListeners. Don't call this method from application code as it is - * automatically called in {@link ModelWire}'s constructor. - * - * @author Daniel Kirschten - */ - protected void wireCreated(ModelWire wire, Runnable destroyed) - { - if (wires.containsKey(wire.name)) - throw new IllegalStateException("Don't add the same wire twice!"); - wires.put(wire.name, wire); - wireDestroyFunctions.put(wire.name, destroyed); - callWireAddedListeners(wire); - requestRedraw(); - } - - /** - * Destroys the given wire, removes it from the list of wires and calls all wireRemovedListeners. - * - * @author Daniel Kirschten - */ - protected void destroyWire(ModelWire wire) - { - wireDestroyFunctions.get(wire.name).run(); - if (!wires.containsKey(wire.name)) - throw new IllegalStateException("Don't remove the same wire twice!"); - wires.remove(wire.name); - callWireRemovedListeners(wire); - requestRedraw(); - } - - public Map getComponentsByName() - { - return componentsUnmodifiable; - } - - public Map getWiresByName() - { - return wiresUnmodifiable; - } - - public ModelComponent getComponentByName(String name) - { - return components.get(name); - } - - @SuppressWarnings("unchecked") - public T getComponentByName(String name, Class expectedComponentClass) - { - ModelComponent comp = components.get(name); - Objects.requireNonNull(comp, "Invaild path, component " + name + " not found"); - if (expectedComponentClass.isInstance(comp)) - return (T) comp; - throw new IllegalArgumentException("The component " + name + " is not an instance of " + expectedComponentClass); - } - - public ModelWire getWireByName(String name) - { - return wires.get(name); - } - - public T getComponentBySubmodelPath(String path, Class modelClass) - { - int firstDot = path.indexOf('.'); - if (firstDot == -1) - return getComponentByName(path, modelClass); - String first = path.substring(0, firstDot); - String rest = path.substring(firstDot + 1); - return getComponentByName(first, SubmodelComponent.class).submodel.getComponentBySubmodelPath(rest, modelClass); - } - - public ModelWire getWireBySubmodelPath(String path) - { - int firstDot = path.indexOf('.'); - if (firstDot == -1) - return getWireByName(path); - String first = path.substring(0, firstDot); - String rest = path.substring(firstDot + 1); - return getComponentByName(first, SubmodelComponent.class).submodel.getWireBySubmodelPath(rest); - } - - // @formatter:off - public void addComponentAddedListener (Consumer listener) {componentAddedListeners .add (listener);} - public void addComponentRemovedListener (Consumer listener) {componentRemovedListeners .add (listener);} - public void addWireAddedListener (Consumer listener) {wireAddedListeners .add (listener);} - public void addWireRemovedListener (Consumer listener) {wireRemovedListeners .add (listener);} - public void addRedrawHandlerChangedListener (Consumer listener) {redrawHandlerChangedListeners.add (listener);} - - public void removeComponentAddedListener (Consumer listener) {componentAddedListeners .remove(listener);} - public void removeComponentRemovedListener (Consumer listener) {componentRemovedListeners .remove(listener);} - public void removeWireAddedListener (Consumer listener) {wireAddedListeners .remove(listener);} - public void removeWireRemovedListener (Consumer listener) {wireRemovedListeners .remove(listener);} - public void removeRedrawHandlerChangedListener(Consumer listener) {redrawHandlerChangedListeners.remove(listener);} - - private void callComponentAddedListeners (ModelComponent c) {componentAddedListeners .forEach(l -> l.accept(c));} - private void callComponentRemovedListeners (ModelComponent c) {componentRemovedListeners .forEach(l -> l.accept(c));} - private void callWireAddedListeners (ModelWire w) {wireAddedListeners .forEach(l -> l.accept(w));} - private void callWireRemovedListeners (ModelWire w) {wireRemovedListeners .forEach(l -> l.accept(w));} - private void callRedrawHandlerChangedListener(Runnable r) {redrawHandlerChangedListeners.forEach(l -> l.accept(r));} - // @formatter:on - - public void setRedrawHandler(Runnable handler) - { - this.redrawHandler = handler; - callRedrawHandlerChangedListener(handler); - } - - public Runnable getRedrawHandler() - { - return redrawHandler; - } - - public void requestRedraw() - { - if (redrawHandler != null) - redrawHandler.run(); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java deleted file mode 100644 index e903257f..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModelModifiable.java +++ /dev/null @@ -1,58 +0,0 @@ -package net.mograsim.logic.model.model; - -import java.util.Set; - -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.ModelWire; -import net.mograsim.logic.model.serializing.IdentifyParams; - -public class LogicModelModifiable extends LogicModel -{ - public String getDefaultComponentName(ModelComponent component) - { - Set componentNames = getComponentsByName().keySet(); - String componentID = component.getIDForSerializing(new IdentifyParams()); - String nameBase = componentID + '#'; - for (int i = 0;; i++) - { - String nameCandidate = nameBase + i; - if (!componentNames.contains(nameCandidate)) - return nameCandidate; - } - } - - public String getDefaultWireName() - { - Set wireNames = getWiresByName().keySet(); - for (int i = 0;; i++) - { - String nameCandidate = "unnamedWire#" + i; - if (!wireNames.contains(nameCandidate)) - return nameCandidate; - } - } - - @Override - public void componentCreated(ModelComponent component, Runnable destroyed) - { - super.componentCreated(component, destroyed); - } - - @Override - public void destroyComponent(ModelComponent component) - { - super.destroyComponent(component); - } - - @Override - public void wireCreated(ModelWire wire, Runnable destroyed) - { - super.wireCreated(wire, destroyed); - } - - @Override - public void destroyWire(ModelWire wire) - { - super.destroyWire(wire); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java deleted file mode 100644 index d543c543..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java +++ /dev/null @@ -1,362 +0,0 @@ -package net.mograsim.logic.model.model.components; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.JSONSerializable; -import net.mograsim.logic.model.snippets.HighLevelStateHandler; - -/** - * The base class for all model components.
- * A ModelComponent has a reference to the LogicModel it belongs to.
- * A ModelComponent has a name. This name is unique in the model the ModelComponent belongs to.
- * A ModelComponent has a position and size. The size can only be modified by subclasses. - * - * @author Daniel Kirschten - */ -public abstract class ModelComponent implements JSONSerializable -{ - /** - * The model this component is a part of. - */ - protected final LogicModelModifiable model; - /** - * The name of this component. Is unique for all components in its model.
- * Does never change, but can't be final since it is set in {@link #init()}. - */ - private String name; - private final Rectangle bounds; - /** - * The list of all pins of this component by name. - */ - private final Map pinsByName; - /** - * An unmodifiable view of {@link #pinsByName}. - */ - protected final Map pinsUnmodifiable; - - private final List> componentMovedListeners; - private final List> componentResizedListeners; - private final List> pinAddedListeners; - private final List> pinRemovedListeners; - - private HighLevelStateHandler highLevelStateHandler; - - // creation and destruction - - public ModelComponent(LogicModelModifiable model, String name) - { - this(model, name, true); - } - - /** - * Creates a new {@link ModelComponent} and, if callInit, initializes the component (See {@link #init()}).
- * If callInit==false, make sure to call {@link #init()}! - * - * @author Daniel Kirschten - */ - protected ModelComponent(LogicModelModifiable model, String name, boolean callInit) - { - this.model = model; - this.name = name; - this.bounds = new Rectangle(0, 0, 0, 0); - this.pinsByName = new HashMap<>(); - this.pinsUnmodifiable = Collections.unmodifiableMap(pinsByName); - - this.componentMovedListeners = new ArrayList<>(); - this.componentResizedListeners = new ArrayList<>(); - this.pinAddedListeners = new ArrayList<>(); - this.pinRemovedListeners = new ArrayList<>(); - - if (callInit) - init(); - } - - /** - * Initializes this component. This method should be called exactly once in this component's constructor.
- *
- *
If {@link #name}==null, sets {@link #name} to {@link LogicModelModifiable#getDefaultComponentName(ModelComponent)}. - *
Registers this component in the model. - *
- */ - protected void init() - { - if (name == null) - name = model.getDefaultComponentName(this); - model.componentCreated(this, this::destroyed); - } - - // basic getters - - public String getName() - { - return name; - } - - /** - * Destroys this component. This method is called from {@link LogicModelModifiable#componentDestroyed(ModelComponent) - * destroyComponent()} of the model this component is a part of.
- * When overriding, make sure to also call the original implementation. - * - * @author Daniel Kirschten - */ - protected void destroyed() - { - pinsByName.values().forEach(this::removePinWithoutRedraw); - } - - // pins - - /** - * Adds the given pin to this component and calls pinAddedListeners and redrawListeners. - * - * @throws IllegalArgumentException if the pin doesn't belong to this component - * @throws IllegalArgumentException if there already is a pin with the given name - * - * @author Daniel Kirschten - */ - protected void addPin(Pin pin) - { - if (pin.component != this) - throw new IllegalArgumentException("Can't add a pin not belonging to this component!"); - if (pinsByName.containsKey(pin.name)) - throw new IllegalArgumentException("Duplicate pin name: " + pin.name); - pinsByName.put(pin.name, pin); - callPinAddedListeners(pin); - model.requestRedraw(); - } - - /** - * Removes the given pin from this component and calls pinAddedListeners and redrawListeners. - * - * @throws NullPointerException if there was no pin with this name - * - * @author Daniel Kirschten - */ - protected void removePin(String name) - { - removePinWithoutRedraw(pinsByName.remove(name)); - model.requestRedraw(); - } - - private void removePinWithoutRedraw(Pin pin) - { - pin.destroyed(); - callPinRemovedListeners(pin); - } - - /** - * Returns a collection of pins of this component. - * - * @author Daniel Kirschten - */ - public Map getPins() - { - return pinsUnmodifiable; - } - - /** - * Returns the pin with the given name of this component. - * - * @throws IllegalArgumentException if there is no pin with the given name - * @see #getPinOrNull(String) - * - * @author Daniel Kirschten - */ - public Pin getPin(String name) - { - Pin pin = getPinOrNull(name); - if (pin == null) - throw new IllegalArgumentException("No pin with the name " + name); - return pin; - } - - /** - * Returns the pin with the given name of this component, or null if there is no such pin. - * - * @see #getPin(String) - * - * @author Daniel Kirschten - */ - public Pin getPinOrNull(String name) - { - return pinsByName.get(name); - } - - // high-level access - - /** - * @author Daniel Kirschten - */ - protected void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler) - { - this.highLevelStateHandler = highLevelStateHandler; - } - - public HighLevelStateHandler getHighLevelStateHandler() - { - return highLevelStateHandler; - } - - /** - * Gets the current value of the given high-level state.
- * See {@link HighLevelStateHandler} for an explanation of high-level state IDs. - * - * @see #setHighLevelState(String, Object) - * @see HighLevelStateHandler#getHighLevelState(String) - * - * @author Daniel Kirschten - */ - public Object getHighLevelState(String stateID) - { - return highLevelStateHandler.getHighLevelState(stateID); - } - - /** - * Sets the given high-level state to the given value.
- * See {@link HighLevelStateHandler} for an explanation of high-level state IDs. - * - * @see #getHighLevelState(String) - * @see HighLevelStateHandler#setHighLevelState(String, Object) - * - * @author Daniel Kirschten - */ - public void setHighLevelState(String stateID, Object newState) - { - highLevelStateHandler.setHighLevelState(stateID, newState); - } - - // "graphical" operations - - /** - * Sets the position of this component and calls componentMovedListeners and redrawListeners. - * - * @author Daniel Kirschten - */ - public void moveTo(double x, double y) - { - bounds.x = x; - bounds.y = y; - callComponentMovedListeners(); - model.requestRedraw(); - } - - /** - * Sets the size of this component and calls redrawListeners. - * - * @author Daniel Kirschten - */ - protected void setSize(double width, double height) - { - bounds.width = width; - bounds.height = height; - callComponentResizedListener(); - model.requestRedraw(); - } - - /** - * Returns the bounds of this component. Is a bit slower than {@link #getPosX()}, {@link #getPosY()}, {@link #getWidth}, - * {@link #getHeight}, because new objects are created. - * - * @author Daniel Kirschten - */ - public final Rectangle getBounds() - { - return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height); - } - - /** - * Returns the x coordinate of the position of this component. Is a bit faster than {@link #getBounds()} because no objects are created. - * - * @author Daniel Kirschten - */ - public double getPosX() - { - return bounds.x; - } - - /** - * Returns the y coordinate of the position of this component. Is a bit faster than {@link #getBounds()} because no objects are created. - * - * @author Daniel Kirschten - */ - public double getPosY() - { - return bounds.y; - } - - /** - * Returns the (graphical) width of this component. Is a bit faster than {@link #getBounds()} because no objects are created. - * - * @author Daniel Kirschten - */ - public double getWidth() - { - return bounds.width; - } - - /** - * Returns the height of this component. Is a bit faster than {@link #getBounds()} because no objects are created. - * - * @author Daniel Kirschten - */ - public double getHeight() - { - return bounds.height; - } - - /** - * Called when this component is clicked. Absolute coordinates of the click are given. Returns true if this component consumed this - * click. - * - * @author Daniel Kirschten - */ - @SuppressWarnings({ "static-method", "unused" }) // this method is inteded to be overridden - public boolean clicked(double x, double y) - { - return false; - } - - /** - * Render this component to the given gc, in absoulute coordinates. - * - * @author Daniel Kirschten - */ - public abstract void render(GeneralGC gc, Rectangle visibleRegion); - - // serializing - - @Override - public Object getParamsForSerializing(IdentifyParams idParams) - { - return null; - } - - // listeners - - // @formatter:off - public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);} - public void addComponentResizedListener (Consumer listener) {componentResizedListeners.add (listener);} - public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);} - public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);} - - public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);} - public void removeComponentResizedListener (Consumer listener) {componentResizedListeners.remove(listener);} - public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);} - public void removePinRemovedListener (Consumer listener) {pinRemovedListeners .remove(listener);} - - private void callComponentMovedListeners ( ) {componentMovedListeners .forEach(l -> l.accept(this));} - private void callComponentResizedListener( ) {componentResizedListeners.forEach(l -> l.accept(this));} - private void callPinAddedListeners (Pin p) {pinAddedListeners .forEach(l -> l.accept(p ));} - private void callPinRemovedListeners (Pin p) {pinRemovedListeners .forEach(l -> l.accept(p ));} - // @formatter:on -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/Orientation.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/Orientation.java deleted file mode 100644 index 9fba366f..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/Orientation.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.mograsim.logic.model.model.components; - -/** - * For components that can have different orientations. The meaning is not clearly defined, however it is common that the orientation - * denotes the direction the output is facing or the general flow of signals. _ALT represents an alternative, which is normally - * a mirrored version. A component can choose to not support some variants. - *
- * In terms of calculation, {@link #RIGHT} is considered the default. - *
- * Note that this needs to be interpreted using the GUI coordinate system, meaning that UP and DOWN are swapped. - * - * @author Christian Femers - */ -public enum Orientation -{ - /** - * The orientation RIGHT is the default orientation, all others are defined relative to it. - */ - RIGHT(1, 0, 0, 1), LEFT(-1, 0, 0, -1), UP(0, 1, -1, 0), DOWN(0, -1, 1, 0), RIGHT_ALT(1, 0, 0, -1), LEFT_ALT(-1, 0, 0, 1), - UP_ALT(0, -1, -1, 0), DOWN_ALT(0, 1, 1, 0); - - // simple 2D transformation matrix - final double trans11; - final double trans12; - final double trans21; - final double trans22; - - private Orientation(double trans11, double trans12, double trans21, double trans22) - { - this.trans11 = trans11; - this.trans12 = trans12; - this.trans21 = trans21; - this.trans22 = trans22; - } - - /** - * Performs a simple rotation around the origin. This does not work for the display coordinate system. - * - * @return the point's new X coordinate - */ - public double getNewX(double rightX, double rightY) - { - return rightX * trans11 + rightY * trans12; - } - - /** - * Performs a simple rotation around the origin. This does not work for the display coordinate system. - * - * @return the point's new Y coordinate - */ - public double getNewY(double rightX, double rightY) - { - return rightX * trans21 + rightY * trans22; - } - - public boolean doesMirror() - { - return ordinal() > 3; - } - - public boolean swapsWidthAndHeight() - { - return trans11 == 0; - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java deleted file mode 100644 index 06621baf..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.mograsim.logic.model.model.components; - -/** - * This class simplifies the calculation of coordinates, especially for model components. - *
- * Supply it with the original width and height and an orientation, and use the methods {@link #newX(double, double)} and - * {@link #newY(double, double)} to retrieve the new coordinates, relative to the upper left corner of {@link Orientation#RIGHT}. The - * {@link #height()} and {@link #width()} methods return the width and height in the new orientation. - *
- * This is meant to be used in the context of a a classic display coordinate system, as done in the {@link ModelComponent}s. - * - * @see Orientation - * @author Christian Femers - */ -public class OrientationCalculator -{ - final Orientation o; - final double oldWHalf; - final double oldHHalf; - final double w; - final double h; - final double wHalf; - final double hHalf; - - public OrientationCalculator(Orientation o, double width, double height) - { - this.o = o; - this.oldWHalf = width / 2; - this.oldHHalf = height / 2; - - if (o.swapsWidthAndHeight()) - { - w = height; - h = width; - wHalf = oldHHalf; - hHalf = oldWHalf; - } else - { - w = width; - h = height; - wHalf = oldWHalf; - hHalf = oldHHalf; - } - } - - /** - * Returns the new height (that equals the old width if {@link Orientation#swapsWidthAndHeight()} is true) - */ - public double height() - { - return h; - } - - /** - * Returns the new width (that equals the old height if {@link Orientation#swapsWidthAndHeight()} is true) - */ - public double width() - { - return w; - } - - public double newX(double x, double y) - { - return (x - oldWHalf) * o.trans11 + (y - oldHHalf) * o.trans12 + wHalf; - } - - public double newY(double x, double y) - { - return (x - oldWHalf) * o.trans21 + (y - oldHHalf) * o.trans22 + hHalf; - } - - public final Orientation getOrientation() - { - return o; - } -} diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java deleted file mode 100644 index 3e836937..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreAndGate; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class ModelAndGate extends SimpleRectangularModelGate -{ - public ModelAndGate(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelAndGate(LogicModelModifiable model, int logicWidth, String name) - { - super(model, "AndGate", "&", false, logicWidth, name, false); - setInputCount(2);// TODO make variable - init(); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelAndGate.class, CoreAndGate::new)); - IndirectModelComponentCreator.setComponentSupplier(ModelAndGate.class.getCanonicalName(), - (m, p, n) -> new ModelAndGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java deleted file mode 100644 index 1a01e141..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.graphics.Color; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Font; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.components.CoreBitDisplay; -import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.preferences.Preferences; - -public class ModelBitDisplay extends ModelComponent -{ - private static final double width = 20; - private static final double height = 15; - private static final double fontHeight = 5; - - public final int logicWidth; - private final Pin inputPin; - - private final LogicObserver logicObs; - private CoreBitDisplay bitDisplay; - - public ModelBitDisplay(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelBitDisplay(LogicModelModifiable model, int logicWidth, String name) - { - super(model, name, false); - this.logicWidth = logicWidth; - logicObs = (i) -> model.requestRedraw(); - - setSize(width, height); - addPin(this.inputPin = new Pin(model, this, "", logicWidth, PinUsage.INPUT, 0, height / 2)); - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); - if (foreground != null) - gc.setForeground(foreground); - gc.drawRectangle(getBounds()); - String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null) - : BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue()); - Font oldFont = gc.getFont(); - Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); - gc.setFont(labelFont); - Point textExtent = gc.textExtent(label); - Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); - if (textColor != null) - gc.setForeground(textColor); - gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true); - gc.setFont(oldFont); - } - - public void setCoreModelBinding(CoreBitDisplay bitDisplay) - { - if (this.bitDisplay != null) - this.bitDisplay.deregisterObserver(logicObs); - this.bitDisplay = bitDisplay; - if (bitDisplay != null) - bitDisplay.registerObserver(logicObs); - } - - public boolean hasCoreModelBinding() - { - return bitDisplay != null; - } - - public CoreBitDisplay getBitDisplay() - { - return bitDisplay; - } - - public Pin getInputPin() - { - return inputPin; - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "BitDisplay"; - } - - @Override - public Integer getParamsForSerializing(IdentifyParams idParams) - { - return logicWidth; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new BitDisplayAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelBitDisplay.class.getCanonicalName(), - (m, p, n) -> new ModelBitDisplay(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java deleted file mode 100644 index 38963536..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java +++ /dev/null @@ -1,168 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.graphics.Color; - -import com.google.gson.JsonSyntaxException; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Font; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.components.CoreClock; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.OrientationCalculator; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.ClockAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.JsonHandler; -import net.mograsim.preferences.Preferences; - -public class ModelClock extends ModelComponent -{ - private static final double width = 20; - private static final double height = 20; - private static final double fontHeight = 5; - - private final Pin outputPin; - - private final LogicObserver logicObs; - private ModelClockParams params; - private OrientationCalculator oc; - private CoreClock clock; - - public ModelClock(LogicModelModifiable model, ModelClockParams params) - { - this(model, params, null); - } - - public ModelClock(LogicModelModifiable model, ModelClockParams params, String name) - { - super(model, name, false); - this.params = params; - logicObs = (i) -> model.requestRedraw(); - - oc = new OrientationCalculator(params.orientation, width, height); - setSize(oc.width(), oc.height()); - - this.outputPin = new Pin(model, this, "", 1, PinUsage.OUTPUT, oc.newX(width, height / 2), oc.newY(width, height / 2)); - addPin(outputPin); - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); - if (foreground != null) - gc.setForeground(foreground); - gc.drawRectangle(getBounds()); - String label = clock == null ? "null" : (clock.isOn() ? "|" : "\u2015"); - Font oldFont = gc.getFont(); - Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); - gc.setFont(labelFont); - Point textExtent = gc.textExtent(label); - Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); - if (textColor != null) - gc.setForeground(textColor); - gc.drawText(label, getPosX() + (oc.width() - textExtent.x) / 2, getPosY() + (oc.height() - textExtent.y) / 2, true); - gc.setFont(oldFont); - } - - public void setCoreModelBinding(CoreClock clock) - { - if (this.clock != null) - this.clock.deregisterObserver(logicObs); - this.clock = clock; - if (clock != null) - clock.registerObserver(logicObs); - } - - public boolean hasCoreModelBinding() - { - return clock != null; - } - - @Override - public Object getHighLevelState(String stateID) - { - switch (stateID) - { - case "out": - if (clock != null) - return clock.getOut().getInputValues(); - return null; - default: - return super.getHighLevelState(stateID); - } - } - - @Override - public void setHighLevelState(String stateID, Object newState) - { - switch (stateID) - { - case "out": - throw new UnsupportedOperationException("cannot set state of clock"); - default: - super.setHighLevelState(stateID, newState); - } - } - - public CoreClock getClock() - { - return clock; - } - - public Pin getOutputPin() - { - return outputPin; - } - - public int getDelta() - { - return params.delta; - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "Clock"; - } - - @Override - public ModelClockParams getParamsForSerializing(IdentifyParams idParams) - { - return params; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new ClockAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelClock.class.getName(), (m, p, n) -> - { - ModelClockParams params = JsonHandler.fromJsonTree(p, ModelClockParams.class); - if (params == null) - throw new JsonSyntaxException("Invalid!!!"); - return new ModelClock(m, params, n); - }); - } - - public static class ModelClockParams - { - int delta; - Orientation orientation; - - public ModelClockParams(int delta, Orientation orientation) - { - this.delta = delta; - this.orientation = orientation; - } - } -} diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java deleted file mode 100644 index 1d3bb1ee..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java +++ /dev/null @@ -1,79 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import java.util.Objects; - -import org.eclipse.swt.graphics.Color; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Font; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.FixedOutputAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.JsonHandler; -import net.mograsim.preferences.Preferences; - -public class ModelFixedOutput extends ModelComponent -{ - private static final double width = 20; - private static final double height = 20; - private static final double fontHeight = 5; - - public final BitVector bits; - - public ModelFixedOutput(LogicModelModifiable model, BitVector bits, String name) - { - super(model, name, false); - this.bits = bits; - setSize(width, height); - addPin(new Pin(model, this, "out", bits.length(), PinUsage.OUTPUT, width, height / 2)); - - init(); - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "FixedOutput"; - } - - @Override - public Object getParamsForSerializing(IdentifyParams idParams) - { - return bits; - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); - if (foreground != null) - gc.setForeground(foreground); - gc.drawRectangle(getBounds()); - String label = BitVectorFormatter.formatAsString(bits); - Font oldFont = gc.getFont(); - Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); - gc.setFont(labelFont); - Point textExtent = gc.textExtent(label); - Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); - if (textColor != null) - gc.setForeground(textColor); - gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true); - gc.setFont(oldFont); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new FixedOutputAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelFixedOutput.class.getCanonicalName(), - (m, p, n) -> new ModelFixedOutput(m, Objects.requireNonNull(JsonHandler.fromJsonTree(p, BitVector.class)), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java deleted file mode 100644 index 7a995041..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java +++ /dev/null @@ -1,185 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.graphics.Color; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Font; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.components.CoreManualSwitch; -import net.mograsim.logic.core.types.Bit; -import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.ManualSwitchAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.preferences.Preferences; - -public class ModelManualSwitch extends ModelComponent -{ - private static final double width = 20; - private static final double height = 15; - private static final double fontHeight = 5; - private static final double heightMiniButtons = 4; // 0 is disabled - - public final int logicWidth; - private final Pin outputPin; - - private final LogicObserver logicObs; - private CoreManualSwitch manualSwitch; - - public ModelManualSwitch(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelManualSwitch(LogicModelModifiable model, int logicWidth, String name) - { - super(model, name, false); - this.logicWidth = logicWidth; - logicObs = (i) -> model.requestRedraw(); - - setSize(width, height); - addPin(this.outputPin = new Pin(model, this, "", logicWidth, PinUsage.OUTPUT, width, height / 2)); - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); - if (foreground != null) - gc.setForeground(foreground); - gc.drawRectangle(getBounds()); - String label = BitVectorFormatter.formatAsString(manualSwitch == null ? null : manualSwitch.getValues()); - Font oldFont = gc.getFont(); - Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle()); - gc.setFont(labelFont); - Point textExtent = gc.textExtent(label); - Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); - if (textColor != null) - gc.setForeground(textColor); - gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true); - gc.setFont(oldFont); - - if (manualSwitch != null && logicWidth > 1 && heightMiniButtons > 0 && visibleRegion.y < getPosY() + heightMiniButtons) - { - double x = getPosX(); - double y = getPosY(); - gc.drawLine(x, y + heightMiniButtons, x + width, y + heightMiniButtons); - Color c = gc.getBackground(); - gc.setBackground(gc.getForeground()); - BitVector bv = manualSwitch.getValues(); - double part = width / bv.length(); - for (int i = 0; i < bv.length(); i++) - { - double start = x + part * i; - if (i != 0) - gc.drawLine(start, y, start, y + heightMiniButtons); - if (bv.getMSBit(i) == Bit.ONE) - { -// gc.fillRectangle(start, y, part, heightMiniButtons); // alternative, but not always visible what Bit is where - gc.drawLine(start, y, start + part, y + heightMiniButtons); - gc.drawLine(start + part, y, start, y + heightMiniButtons); - } - } - gc.setBackground(c); - } - } - - public void setCoreModelBinding(CoreManualSwitch logicSwitch) - { - if (this.manualSwitch != null) - this.manualSwitch.deregisterObserver(logicObs); - this.manualSwitch = logicSwitch; - if (logicSwitch != null) - logicSwitch.registerObserver(logicObs); - } - - public boolean hasCoreModelBinding() - { - return manualSwitch != null; - } - - @Override - public Object getHighLevelState(String stateID) - { - switch (stateID) - { - case "out": - if (manualSwitch != null) - return manualSwitch.getValues(); - return null; - default: - return super.getHighLevelState(stateID); - } - } - - @Override - public void setHighLevelState(String stateID, Object newState) - { - switch (stateID) - { - case "out": - if (manualSwitch != null) - manualSwitch.setState((BitVector) newState); - break; - default: - super.setHighLevelState(stateID, newState); - break; - } - } - - @Override - public boolean clicked(double x, double y) - { - if (manualSwitch != null) - { - if (heightMiniButtons > 0 && y - getPosY() < heightMiniButtons) - { - int part = (int) ((x - getPosX()) * logicWidth / width); - manualSwitch.setState(manualSwitch.getValues().withBitChanged(part, Bit::not)); - } else - { - manualSwitch.toggle(); - } - } - return true; - } - - public CoreManualSwitch getManualSwitch() - { - return manualSwitch; - } - - public Pin getOutputPin() - { - return outputPin; - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "ManualSwitch"; - } - - @Override - public Integer getParamsForSerializing(IdentifyParams idParams) - { - return logicWidth; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new ManualSwitchAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelManualSwitch.class.getName(), - (m, p, n) -> new ModelManualSwitch(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java deleted file mode 100644 index 6efc9ad3..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java +++ /dev/null @@ -1,126 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.SWT; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.atomic.ModelSplitter.SplitterParams; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.preferences.ColorDefinition; -import net.mograsim.preferences.ColorManager; -import net.mograsim.preferences.Preferences; - -//TODO delete this legacy class -public class ModelMerger extends ModelComponent -{ - private static final double width = 10; - private static final double heightPerPin = 10; - - public final int logicWidth; - private final Pin outputPin; - - private final ReadEnd[] inputEnds; - private ReadEnd outputEnd; - - public ModelMerger(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelMerger(LogicModelModifiable model, int logicWidth, String name) - { - super(model, name, false); - this.logicWidth = logicWidth; - setSize(width, (logicWidth - 1) * heightPerPin); - double inputHeight = (logicWidth - 1) * heightPerPin; - for (int i = 0; i < logicWidth; i++, inputHeight -= 10) - addPin(new Pin(model, this, "O" + i, 1, PinUsage.TRISTATE, 0, inputHeight)); - addPin(this.outputPin = new Pin(model, this, "I", logicWidth, PinUsage.TRISTATE, width, (logicWidth - 1) * heightPerPin / 2)); - inputEnds = new ReadEnd[logicWidth]; - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - double posX = getPosX(); - double posY = getPosY(); - - ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd); - if (c != null) - gc.setForeground(ColorManager.current().toColor(c)); - gc.setLineWidth( - Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire." + (logicWidth == 1 ? "singlebit" : "multibit"))); - double outLineY = posY + (logicWidth - 1) * heightPerPin / 2; - gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire.singlebit")); - double inputHeight = posY; - for (int i = 0; i < logicWidth; i++, inputHeight += 10) - { - c = BitVectorFormatter.formatAsColor(inputEnds[i]); - if (c != null) - gc.setForeground(ColorManager.current().toColor(c)); - gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight); - } - gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground")); - int oldLineCap = gc.getLineCap(); - int lineJoin = gc.getLineJoin(); - // TODO find better "replacement" for JOIN_BEVEL - // TODO it looks weird that the vertical line is thinner than the single multibit wire. - gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE); - gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1)); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default")); - gc.setLineCap(oldLineCap); - } - - @Override - public Pin getPin(String name) - { - Pin pin = getPinOrNull(name); - return pin == null ? getPin(name.replace('O', 'i').replace('I', 'O').replace('i', 'I')) : pin; - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "Splitter"; - } - - @Override - public SplitterParams getParamsForSerializing(IdentifyParams idParams) - { - SplitterParams splitterParams = new SplitterParams(); - splitterParams.logicWidth = logicWidth; - splitterParams.orientation = Orientation.LEFT; - return splitterParams; - } - - public void setCoreModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd) - { - System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth); - this.outputEnd = outputEnd; - } - - public Pin getOutputPin() - { - return outputPin; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new MergerAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelMerger.class.getCanonicalName(), - (m, p, n) -> new ModelMerger(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java deleted file mode 100644 index b4e91d87..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreNandGate; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class ModelNandGate extends SimpleRectangularModelGate -{ - public ModelNandGate(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelNandGate(LogicModelModifiable model, int logicWidth, String name) - { - super(model, "NandGate", "&", true, logicWidth, name, false); - setInputCount(2);// TODO make variable - init(); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelNandGate.class, CoreNandGate::new)); - IndirectModelComponentCreator.setComponentSupplier(ModelNandGate.class.getCanonicalName(), - (m, p, n) -> new ModelNandGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java deleted file mode 100644 index 8f3849f9..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreNotGate; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class ModelNotGate extends SimpleRectangularModelGate -{ - public ModelNotGate(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelNotGate(LogicModelModifiable model, int logicWidth, String name) - { - super(model, "NotGate", "1", true, logicWidth, name, false); - setInputCount(1); - init(); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelNotGate.class, (t, p, o, i) -> new CoreNotGate(t, p, i[0], o))); - IndirectModelComponentCreator.setComponentSupplier(ModelNotGate.class.getCanonicalName(), - (m, p, n) -> new ModelNotGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java deleted file mode 100644 index c09569ed..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreOrGate; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; - -public class ModelOrGate extends SimpleRectangularModelGate -{ - public ModelOrGate(LogicModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public ModelOrGate(LogicModelModifiable model, int logicWidth, String name) - { - super(model, "OrGate", "\u22651", false, logicWidth, name, false);// ">=1" - setInputCount(2); - init(); - } - - static - { - LogicCoreAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelOrGate.class, CoreOrGate::new)); - IndirectModelComponentCreator.setComponentSupplier(ModelOrGate.class.getCanonicalName(), - (m, p, n) -> new ModelOrGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java deleted file mode 100644 index 962f2acc..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java +++ /dev/null @@ -1,165 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.SWT; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.types.BitVectorFormatter; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.OrientationCalculator; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.JsonHandler; -import net.mograsim.preferences.ColorDefinition; -import net.mograsim.preferences.ColorManager; -import net.mograsim.preferences.Preferences; - -public class ModelSplitter extends ModelComponent -{ - private static final double width = 10; - private static final double heightPerPin = 10; - - private final double heightWithoutOC; - public final int logicWidth; - private final OrientationCalculator oc; - private final Pin inputPin; - - private ReadEnd inputEnd; - private final ReadEnd[] outputEnds; - - public ModelSplitter(LogicModelModifiable model, SplitterParams params) - { - this(model, params, null); - } - - public ModelSplitter(LogicModelModifiable model, SplitterParams params, String name) - { - super(model, name, false); - this.logicWidth = params.logicWidth; - this.oc = new OrientationCalculator(toggleLeftDownAlt(params.orientation), width, - this.heightWithoutOC = (logicWidth - 1) * heightPerPin); - setSize(oc.width(), oc.height()); - double inLineY = (logicWidth - 1) * heightPerPin / 2; - addPin(this.inputPin = new Pin(model, this, "I", logicWidth, PinUsage.TRISTATE, oc.newX(0, inLineY), oc.newY(0, inLineY))); - double outputHeight = (logicWidth - 1) * heightPerPin; - for (int i = 0; i < logicWidth; i++, outputHeight -= 10) - addPin(new Pin(model, this, "O" + i, 1, PinUsage.TRISTATE, oc.newX(width, outputHeight), oc.newY(width, outputHeight))); - outputEnds = new ReadEnd[logicWidth]; - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - double posX = getPosX(); - double posY = getPosY(); - - ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd); - if (c != null) - gc.setForeground(ColorManager.current().toColor(c)); - gc.setLineWidth( - Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire." + (logicWidth == 1 ? "singlebit" : "multibit"))); - double inLineY = heightWithoutOC / 2; - gc.drawLine(posX + oc.newX(0, inLineY), posY + oc.newY(0, inLineY), posX + oc.newX(width / 2, inLineY), - posY + oc.newY(width / 2, inLineY)); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire.singlebit")); - double outputHeight = 0; - for (int i = 0; i < logicWidth; i++, outputHeight += 10) - { - c = BitVectorFormatter.formatAsColor(outputEnds[i]); - if (c != null) - gc.setForeground(ColorManager.current().toColor(c)); - gc.drawLine(posX + oc.newX(width / 2, outputHeight), posY + oc.newY(width / 2, outputHeight), - posX + oc.newX(width, outputHeight), posY + oc.newY(width, outputHeight)); - } - gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground")); - int oldLineCap = gc.getLineCap(); - int lineJoin = gc.getLineJoin(); - // TODO find better "replacement" for JOIN_BEVEL - // TODO it looks weird that the vertical line is thinner than the single multibit wire. - gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE); - gc.drawLine(posX + oc.newX(width / 2, 0), posY + oc.newY(width / 2, 0), posX + oc.newX(width / 2, heightWithoutOC), - posY + oc.newY(width / 2, heightWithoutOC)); - gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default")); - gc.setLineCap(oldLineCap); - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "Splitter"; - } - - @Override - public SplitterParams getParamsForSerializing(IdentifyParams idParams) - { - SplitterParams splitterParams = new SplitterParams(); - splitterParams.logicWidth = logicWidth; - splitterParams.orientation = toggleLeftDownAlt(oc.getOrientation()); - return splitterParams; - } - - public void setCoreModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds) - { - this.inputEnd = inputEnd; - System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth); - } - - public Pin getInputPin() - { - return inputPin; - } - - /** - * Used to leave bit order intuitive (MSB left or on top) - */ - private static Orientation toggleLeftDownAlt(Orientation orientation) - { - // TODO if we upgrade to Java 12, replace with switch-expression - switch (orientation) - { - case LEFT: - return Orientation.LEFT_ALT; - case LEFT_ALT: - return Orientation.LEFT; - case DOWN: - return Orientation.DOWN_ALT; - case DOWN_ALT: - return Orientation.DOWN; - default: - return orientation; - } - } - - public static class SplitterParams - { - public int logicWidth; - public Orientation orientation; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new SplitterAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelSplitter.class.getCanonicalName(), (m, p, n) -> - { - // TODO remove legacy params parsing - SplitterParams params; - if (p.isJsonPrimitive()) - { - params = new SplitterParams(); - params.logicWidth = p.getAsInt(); - params.orientation = Orientation.RIGHT; - } else - params = JsonHandler.fromJsonTree(p, SplitterParams.class); - return new ModelSplitter(m, params, n); - }); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java deleted file mode 100644 index ac0f64d7..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java +++ /dev/null @@ -1,74 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.graphics.Color; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.NoLogicAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.preferences.Preferences; - -//TODO clean size calculation mess -public class ModelTextComponent extends ModelComponent -{ - private final String text; - private boolean calculatedSize; - - public ModelTextComponent(LogicModelModifiable model, String text) - { - this(model, text, null); - } - - public ModelTextComponent(LogicModelModifiable model, String text, String name) - { - super(model, name, false); - this.text = text; - // If size is unset, it defaults to 0, which could prohibit this component from being rendered, which would prohibit the size being - // set to a better guess - setSize(1, 1); - - init(); - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - if (!calculatedSize) - { - calculatedSize = true; - Point textExtent = gc.textExtent(text); - setSize(textExtent.x, textExtent.y); - } - - Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text"); - if (textColor != null) - gc.setForeground(textColor); - gc.drawText(text, getPosX(), getPosY(), true); - } - - // serializing - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "TextComponent"; - } - - @Override - public String getParamsForSerializing(IdentifyParams idParams) - { - return text; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new NoLogicAdapter<>(ModelTextComponent.class)); - IndirectModelComponentCreator.setComponentSupplier(ModelTextComponent.class.getName(), - (m, p, n) -> new ModelTextComponent(m, p.getAsString(), n)); - } -} diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java deleted file mode 100644 index 93bff320..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java +++ /dev/null @@ -1,126 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import org.eclipse.swt.graphics.Color; - -import com.google.gson.JsonSyntaxException; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.OrientationCalculator; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.TriStateBufferAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -import net.mograsim.logic.model.util.JsonHandler; -import net.mograsim.preferences.Preferences; - -public class ModelTriStateBuffer extends ModelComponent -{ - - private static final double width = 20; - private static final double height = 20; - private Pin input; - private Pin output; - private Pin enable; - private double[] path; - - private ModelTriStateBufferParams params; - private OrientationCalculator oc; - - public ModelTriStateBuffer(LogicModelModifiable model, ModelTriStateBufferParams params) - { - this(model, params, null); - } - - public ModelTriStateBuffer(LogicModelModifiable model, ModelTriStateBufferParams params, String name) - { - super(model, name, false); - this.params = params; - - oc = new OrientationCalculator(params.orientation, width, height); - - double wHalf = width / 2; - double hHalf = height / 2; - double hQuar = height / 4; - - this.input = new Pin(model, this, "IN", params.logicWidth, PinUsage.INPUT, oc.newX(0, hHalf), oc.newY(0, hHalf)); - this.output = new Pin(model, this, "OUT", params.logicWidth, PinUsage.OUTPUT, oc.newX(width, hHalf), oc.newY(width, hHalf)); - this.enable = new Pin(model, this, "EN", 1, PinUsage.INPUT, oc.newX(wHalf, hQuar), oc.newY(wHalf, hQuar)); - this.path = new double[] { oc.newX(0, 0), oc.newY(0, 0), oc.newX(width, hHalf), oc.newY(width, hHalf), oc.newX(0, height), - oc.newY(0, height) }; - - setSize(oc.width(), oc.height()); - addPin(input); - addPin(output); - addPin(enable); - - init(); - } - - public final Pin getInputPin() - { - return input; - } - - public final Pin getOutputPin() - { - return output; - } - - public final Pin getEnablePin() - { - return enable; - } - - @Override - public void render(GeneralGC gc, Rectangle visibleRegion) - { - Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground"); - if (foreground != null) - gc.setForeground(foreground); - double x = getPosX(); - double y = getPosY(); - gc.drawPolygon(new double[] { x + path[0], y + path[1], x + path[2], y + path[3], x + path[4], y + path[5] }); - } - - @Override - public String getIDForSerializing(IdentifyParams idParams) - { - return "TriStateBuffer"; - } - - @Override - public ModelTriStateBufferParams getParamsForSerializing(IdentifyParams idParams) - { - return params; - } - - static - { - LogicCoreAdapter.addComponentAdapter(new TriStateBufferAdapter()); - IndirectModelComponentCreator.setComponentSupplier(ModelTriStateBuffer.class.getName(), (m, p, n) -> - { - ModelTriStateBufferParams params = JsonHandler.fromJsonTree(p, ModelTriStateBufferParams.class); - if (params == null) - throw new JsonSyntaxException("Invalid!!!"); - return new ModelTriStateBuffer(m, params, n); - }); - } - - public static class ModelTriStateBufferParams - { - int logicWidth; - Orientation orientation; - - public ModelTriStateBufferParams(int logicWidth, Orientation orientation) - { - this.logicWidth = logicWidth; - this.orientation = orientation; - } - } -} diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java deleted file mode 100644 index 8971285a..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java +++ /dev/null @@ -1,161 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; - -import net.haspamelodica.swt.helper.gcs.GeneralGC; -import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.LogicModelModifiable; -import net.mograsim.logic.model.model.components.ModelComponent; -import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleRectangularHardcodedModelComponentAdapter; -import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.snippets.HighLevelStateHandler; -import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; -import net.mograsim.logic.model.snippets.symbolrenderers.CenteredTextSymbolRenderer; -import net.mograsim.logic.model.snippets.symbolrenderers.CenteredTextSymbolRenderer.CenteredTextParams; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams; -import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; - -public abstract class SimpleRectangularHardcodedModelComponent extends ModelComponent -{ - private static final double centerTextHeight = 5; - private static final double pinNamesHeight = 3.5; - private static final double pinNamesMargin = .5; - - private final String id; - - private final DefaultOutlineRenderer outlineRenderer; - private final CenteredTextSymbolRenderer centerTextRenderer; - private final PinNamesSymbolRenderer pinNamesRenderer; - - private AtomicReference