Mograsim.git
4 years agoMerge 'transportdelay' into development
Daniel Kirschten [Thu, 12 Sep 2019 21:13:01 +0000 (23:13 +0200)]
Merge 'transportdelay' into development

4 years agoFixed TestableAm2901Impl
Daniel Kirschten [Thu, 12 Sep 2019 21:12:48 +0000 (23:12 +0200)]
Fixed TestableAm2901Impl

4 years agoLayouted Am2900; fixed small layout problems in some JSONs
Daniel Kirschten [Thu, 12 Sep 2019 20:45:49 +0000 (22:45 +0200)]
Layouted Am2900; fixed small layout problems in some JSONs

4 years agoMade ModelMemoryWA referencable from components
Daniel Kirschten [Thu, 12 Sep 2019 19:31:40 +0000 (21:31 +0200)]
Made ModelMemoryWA referencable from components

4 years agoAdded a missing BitDisplay
Daniel Kirschten [Thu, 12 Sep 2019 13:01:26 +0000 (15:01 +0200)]
Added a missing BitDisplay

4 years agoMore work in Am2900:
Daniel Kirschten [Thu, 12 Sep 2019 12:45:36 +0000 (14:45 +0200)]
More work in Am2900:

-created some missing connections
-created switches/displays for things we can't connect yet

4 years agoCreated dff16
Daniel Kirschten [Thu, 12 Sep 2019 12:43:44 +0000 (14:43 +0200)]
Created dff16

4 years agoUnified D-input of the Am2901; fixed Y input bit order
Daniel Kirschten [Thu, 12 Sep 2019 12:25:22 +0000 (14:25 +0200)]
Unified D-input of the Am2901; fixed Y input bit order

4 years agoContinued wiring up Am2900.
Daniel Kirschten [Thu, 12 Sep 2019 12:17:01 +0000 (14:17 +0200)]
Continued wiring up Am2900.

It is almost complete now! Missing:
-MPS (or MPM in English?)
-MPROM
-RAM
-some clock signals
  (not yet done because I don't know the polarities for some components)
-some Am2901 signals
-HighLevelStates
-layouting, as always

4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Thu, 12 Sep 2019 12:10:48 +0000 (14:10 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development

4 years agoUnified Am2901 I- and Y-inputs
Fabian Stemmler [Thu, 12 Sep 2019 12:04:24 +0000 (14:04 +0200)]
Unified Am2901 I- and Y-inputs

4 years agoConnected some microinstruction bits to the machine
Daniel Kirschten [Thu, 12 Sep 2019 11:37:12 +0000 (13:37 +0200)]
Connected some microinstruction bits to the machine

4 years agoAdded am2901 package to MANIFEST's Export-Packages
Daniel Kirschten [Thu, 12 Sep 2019 10:38:01 +0000 (12:38 +0200)]
Added am2901 package to MANIFEST's Export-Packages

4 years agoAdded simple line counter to be able to show off and feel great ;)
Daniel Kirschten [Thu, 12 Sep 2019 10:32:39 +0000 (12:32 +0200)]
Added simple line counter to be able to show off and feel great ;)

4 years agodff80 now has HighLevelStates:
Daniel Kirschten [Thu, 12 Sep 2019 10:18:49 +0000 (12:18 +0200)]
dff80 now has HighLevelStates:

"q"             all 80 bit (as a BitVector)
"q1"-"q80"      single bits (MSBit=q80, LSBit=q1; as Bit or BitVector)
"q8-1"-"q80-73" sub-bytes (MSB=q80-73, LSB=q8-1; as BitVector)

4 years agoAm2901 finally snaps correctly
Fabian Stemmler [Thu, 12 Sep 2019 10:18:23 +0000 (12:18 +0200)]
Am2901 finally snaps correctly

4 years agoReplaced HighLevelStateHandlerContext with SubmodelComponent
Daniel Kirschten [Thu, 12 Sep 2019 09:43:50 +0000 (11:43 +0200)]
Replaced HighLevelStateHandlerContext with SubmodelComponent

4 years agoChanged sub-DFF names order in dff80
Daniel Kirschten [Thu, 12 Sep 2019 09:43:23 +0000 (11:43 +0200)]
Changed sub-DFF names order in dff80

4 years agoSimple...HardcodedModelComponent now has a constructor without callInit
Daniel Kirschten [Thu, 12 Sep 2019 09:21:37 +0000 (11:21 +0200)]
Simple...HardcodedModelComponent now has a constructor without callInit

4 years agoAdded microinstruction register
Daniel Kirschten [Thu, 12 Sep 2019 09:18:22 +0000 (11:18 +0200)]
Added microinstruction register

4 years agoCreated dff8, dff80, mux1_8; reserialized dff12_we, Am2904Testbench
Daniel Kirschten [Thu, 12 Sep 2019 09:15:18 +0000 (11:15 +0200)]
Created dff8, dff80, mux1_8; reserialized dff12_we, Am2904Testbench

4 years agoBetter exception in DelegatingAtomicHighLevelStateHandler
Daniel Kirschten [Thu, 12 Sep 2019 09:12:45 +0000 (11:12 +0200)]
Better exception in DelegatingAtomicHighLevelStateHandler

4 years agoRemoved legacy getIdentifier method; Editor now can duplicate Mergers
Daniel Kirschten [Thu, 12 Sep 2019 09:12:18 +0000 (11:12 +0200)]
Removed legacy getIdentifier method; Editor now can duplicate Mergers

4 years agodff12_we, dff16_invwe, dff16_we now have HighLevelStates
Daniel Kirschten [Wed, 11 Sep 2019 16:54:01 +0000 (18:54 +0200)]
dff12_we, dff16_invwe, dff16_we now have HighLevelStates

4 years agoChanged BitVectorSplittingAtomicHighLevelStateHandler's part order
Daniel Kirschten [Wed, 11 Sep 2019 16:46:50 +0000 (18:46 +0200)]
Changed BitVectorSplittingAtomicHighLevelStateHandler's part order

4 years agoHighLevelStates are now sorted in JSONs
Daniel Kirschten [Wed, 11 Sep 2019 16:26:54 +0000 (18:26 +0200)]
HighLevelStates are now sorted in JSONs

4 years agoEditor now draws component names
Daniel Kirschten [Wed, 11 Sep 2019 16:16:43 +0000 (18:16 +0200)]
Editor now draws component names

4 years agoImproved some snippets (HighLevelStateHandlers and PinNamesRenderer)
Daniel Kirschten [Wed, 11 Sep 2019 15:22:51 +0000 (17:22 +0200)]
Improved some snippets (HighLevelStateHandlers and PinNamesRenderer)

4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Wed, 11 Sep 2019 15:11:45 +0000 (17:11 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development

4 years agoMoved a few outputs of Am2901
Fabian Stemmler [Wed, 11 Sep 2019 15:11:25 +0000 (17:11 +0200)]
Moved a few outputs of Am2901

4 years agoReserializeJSONs checks component sizes
Daniel Kirschten [Wed, 11 Sep 2019 14:50:17 +0000 (16:50 +0200)]
ReserializeJSONs checks component sizes

4 years agoRenamed ReserializeJSONs
Daniel Kirschten [Wed, 11 Sep 2019 14:47:57 +0000 (16:47 +0200)]
Renamed ReserializeJSONs

4 years agoMade GUIMerger and GUISplitter the same thing
Daniel Kirschten [Wed, 11 Sep 2019 14:40:47 +0000 (16:40 +0200)]
Made GUIMerger and GUISplitter the same thing

4 years agoChanged BZ to 16 bit
Daniel Kirschten [Wed, 11 Sep 2019 13:43:02 +0000 (15:43 +0200)]
Changed BZ to 16 bit

4 years agoFixed a bug causing submodelInterfacePins to "be" in the wrong model
Daniel Kirschten [Wed, 11 Sep 2019 13:32:38 +0000 (15:32 +0200)]
Fixed a bug causing submodelInterfacePins to "be" in the wrong model

4 years agoMade Modelinc12 generic
Daniel Kirschten [Wed, 11 Sep 2019 13:16:16 +0000 (15:16 +0200)]
Made Modelinc12 generic

4 years agoFleshed out Am2900MicroInstructionDefinition
Fabian Stemmler [Tue, 10 Sep 2019 16:13:13 +0000 (18:13 +0200)]
Fleshed out Am2900MicroInstructionDefinition

4 years agoFixed a Wire overlapping with a component in Am2901
Fabian Stemmler [Tue, 10 Sep 2019 16:00:16 +0000 (18:00 +0200)]
Fixed a Wire overlapping with a component in Am2901

4 years agoFixed crooked Wires and swapped I3 and I4 in Am901ALUInclSource...
Fabian Stemmler [Tue, 10 Sep 2019 15:41:55 +0000 (17:41 +0200)]
Fixed crooked Wires and swapped I3 and I4 in Am901ALUInclSource...

4 years agoFixed crooked wires
Fabian Stemmler [Tue, 10 Sep 2019 15:26:45 +0000 (17:26 +0200)]
Fixed crooked wires

4 years agoRestructured Am2901 and Am901ALUInclSourceDecodeInclFunctionDecode
Fabian Stemmler [Tue, 10 Sep 2019 14:40:57 +0000 (16:40 +0200)]
Restructured Am2901 and Am901ALUInclSourceDecodeInclFunctionDecode

4 years agoAm2900 project: Added components source folder to build.properties
Daniel Kirschten [Mon, 9 Sep 2019 15:54:06 +0000 (17:54 +0200)]
Am2900 project: Added components source folder to build.properties

4 years agoTimeline PriorityQueue now uses stable sorting
Fabian Stemmler [Mon, 9 Sep 2019 16:02:43 +0000 (18:02 +0200)]
Timeline PriorityQueue now uses stable sorting

4 years agoMerge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
Fabian Stemmler [Mon, 9 Sep 2019 15:30:17 +0000 (17:30 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development

4 years agoImproved Am2900MicroInstructionDefinition
Fabian Stemmler [Mon, 9 Sep 2019 15:30:00 +0000 (17:30 +0200)]
Improved Am2900MicroInstructionDefinition

4 years agoFixed performance issue with tables
Fabian Stemmler [Mon, 9 Sep 2019 15:29:19 +0000 (17:29 +0200)]
Fixed performance issue with tables

4 years agoAdded net.mograsim.machine to feature
Daniel Kirschten [Mon, 9 Sep 2019 15:28:30 +0000 (17:28 +0200)]
Added net.mograsim.machine to feature

4 years agoFixed an issue: InstructionView now updates when immediates are modified
Fabian Stemmler [Mon, 9 Sep 2019 08:53:21 +0000 (10:53 +0200)]
Fixed an issue: InstructionView now updates when immediates are modified

4 years agoFixed a layout problem in Am2904
Daniel Kirschten [Sun, 8 Sep 2019 21:55:02 +0000 (23:55 +0200)]
Fixed a layout problem in Am2904

4 years agoFurther work in JSONs:
Daniel Kirschten [Sun, 8 Sep 2019 21:35:40 +0000 (23:35 +0200)]
Further work in JSONs:

-layouted Am2904
-ReserializeJSONsSettingUsages now can snap WCPs properly and reports
all components, wire points, and interface pins not snapped to grid
-relayouted Am2910 a bit
-deleted obsolete mux2_4

4 years agoJsonHandler now supports Unicode (used in Am2904muSR)
Daniel Kirschten [Sun, 8 Sep 2019 20:18:25 +0000 (22:18 +0200)]
JsonHandler now supports Unicode (used in Am2904muSR)

4 years agoMade Am2900 a standard component; HLSShell no longer opens per default
Daniel Kirschten [Sun, 8 Sep 2019 15:45:58 +0000 (17:45 +0200)]
Made Am2900 a standard component; HLSShell no longer opens per default

4 years agoStarted layouting the Am2904
Daniel Kirschten [Sun, 8 Sep 2019 15:43:06 +0000 (17:43 +0200)]
Started layouting the Am2904

4 years agoCoreComponents now have a transport delay
Fabian Stemmler [Sun, 8 Sep 2019 14:21:39 +0000 (16:21 +0200)]
CoreComponents now have a transport delay

There is now an issue with simultaneous signal changes, because the
generated events might not be executed in the order in which they are
created.

4 years agoChanged two component's center texts
Daniel Kirschten [Sun, 8 Sep 2019 11:54:30 +0000 (13:54 +0200)]
Changed two component's center texts

4 years agoFixed a problem with ModelComponent's names
Daniel Kirschten [Sun, 8 Sep 2019 11:38:16 +0000 (13:38 +0200)]
Fixed a problem with ModelComponent's names

4 years agoFixed Am2904 tests; updated to new SWTHelper version
Daniel Kirschten [Sun, 8 Sep 2019 11:37:45 +0000 (13:37 +0200)]
Fixed Am2904 tests; updated to new SWTHelper version

4 years agoRedo reserializing components since the problem doesn't lie there
Daniel Kirschten [Sun, 8 Sep 2019 10:07:56 +0000 (12:07 +0200)]
Redo reserializing components since the problem doesn't lie there

4 years agoAdded address column to instruction editor
Fabian Stemmler [Sat, 7 Sep 2019 14:06:16 +0000 (16:06 +0200)]
Added address column to instruction editor

4 years agoMerge branch 'development' of
Fabian Stemmler [Fri, 6 Sep 2019 20:13:45 +0000 (22:13 +0200)]
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
net.mograsim.machine/src/net/mograsim/machine/Machine.java

4 years agoUpdated Am2900Machine and -Definition; Added MachineContext
Fabian Stemmler [Fri, 6 Sep 2019 19:04:07 +0000 (21:04 +0200)]
Updated Am2900Machine and -Definition; Added MachineContext

MemoryView and InstructionView were updated to depend on the
MachineContext

4 years agoUndo reserializing components since something broke
Daniel Kirschten [Fri, 6 Sep 2019 08:41:30 +0000 (10:41 +0200)]
Undo reserializing components since something broke

4 years agoFixed a performance issue in CoreWire introduced when fixing Fusions
Daniel Kirschten [Fri, 6 Sep 2019 07:50:22 +0000 (09:50 +0200)]
Fixed a performance issue in CoreWire introduced when fixing Fusions

4 years agoReserialized components with default names
Daniel Kirschten [Thu, 5 Sep 2019 22:44:28 +0000 (00:44 +0200)]
Reserialized components with default names

4 years agoCleaned up ID overriding in DeserializedSubmodelComponent
Daniel Kirschten [Thu, 5 Sep 2019 22:43:49 +0000 (00:43 +0200)]
Cleaned up ID overriding in DeserializedSubmodelComponent

4 years agoReserialized JSONs (changed component order due to new IDs)
Daniel Kirschten [Thu, 5 Sep 2019 22:05:30 +0000 (00:05 +0200)]
Reserialized JSONs (changed component order due to new IDs)

4 years agoCleaned LogicModelModifiable.getDefaultComponentName
Daniel Kirschten [Thu, 5 Sep 2019 22:03:32 +0000 (00:03 +0200)]
Cleaned LogicModelModifiable.getDefaultComponentName

4 years agoRepaired Am2904Testbench
Daniel Kirschten [Thu, 5 Sep 2019 22:03:16 +0000 (00:03 +0200)]
Repaired Am2904Testbench

4 years agoCleaned up initializing of ModelComponents (also improved HLSDebugShell)
Daniel Kirschten [Thu, 5 Sep 2019 20:47:50 +0000 (22:47 +0200)]
Cleaned up initializing of ModelComponents (also improved HLSDebugShell)

4 years agoWires connected to a component now get deleted with the component
Daniel Kirschten [Thu, 5 Sep 2019 18:33:46 +0000 (20:33 +0200)]
Wires connected to a component now get deleted with the component

4 years agoRenamed ViewModel to LogicModel
Daniel Kirschten [Thu, 5 Sep 2019 18:17:16 +0000 (20:17 +0200)]
Renamed ViewModel to LogicModel

4 years agoRenamed logic to core where appropiate
Daniel Kirschten [Thu, 5 Sep 2019 16:35:53 +0000 (18:35 +0200)]
Renamed logic to core where appropiate

4 years agoFixed ModelMemoryWA
Daniel Kirschten [Thu, 5 Sep 2019 16:15:26 +0000 (18:15 +0200)]
Fixed ModelMemoryWA

4 years agoRefactored MicroprogramMemory to MicroInstructionMemory
Fabian Stemmler [Thu, 5 Sep 2019 15:53:29 +0000 (17:53 +0200)]
Refactored MicroprogramMemory to MicroInstructionMemory

4 years agoRenamed GUI to Model:
Daniel Kirschten [Thu, 5 Sep 2019 15:47:07 +0000 (17:47 +0200)]
Renamed GUI to Model:

-Renamed GUIComponents to have the common prefix Model instead of GUI.
-Renamed JSONs to have no prefix
-Rename IDs to have no prefix

4 years agoRenamed core components to have the common prefix Core
Daniel Kirschten [Thu, 5 Sep 2019 15:28:32 +0000 (17:28 +0200)]
Renamed core components to have the common prefix Core

4 years agoAdded PC to GUIAm2900
Daniel Kirschten [Thu, 5 Sep 2019 14:59:44 +0000 (16:59 +0200)]
Added PC to GUIAm2900

4 years agoImplemented GUIdff12_we
Daniel Kirschten [Thu, 5 Sep 2019 14:59:26 +0000 (16:59 +0200)]
Implemented GUIdff12_we

4 years agoImplemented GUIdff16_invwe
Daniel Kirschten [Thu, 5 Sep 2019 13:26:32 +0000 (15:26 +0200)]
Implemented GUIdff16_invwe

4 years agoEditor now creates a new component per default; re-added New option
Daniel Kirschten [Thu, 5 Sep 2019 13:26:13 +0000 (15:26 +0200)]
Editor now creates a new component per default; re-added New option

4 years agoFixed a bug in GUIAm2910
Daniel Kirschten [Wed, 4 Sep 2019 22:11:05 +0000 (00:11 +0200)]
Fixed a bug in GUIAm2910

4 years agoFurther additions in GUIAm2900
Daniel Kirschten [Wed, 4 Sep 2019 22:08:23 +0000 (00:08 +0200)]
Further additions in GUIAm2900

4 years agoAdded FixedOutputAdapter and cleaned some things up
Daniel Kirschten [Wed, 4 Sep 2019 22:00:13 +0000 (00:00 +0200)]
Added FixedOutputAdapter and cleaned some things up

4 years agoStarted wiring up Am2900.
Daniel Kirschten [Wed, 4 Sep 2019 21:32:14 +0000 (23:32 +0200)]
Started wiring up Am2900.

I don't layout yet, because the components probably will change a bit
(for example the Am2901 will use 4-bit wires instead of 4 1-bit ones)

4 years agoGUIAm2901's RAM/Qn/n+3 now are tristate pins (also updated SWTHelper)
Daniel Kirschten [Wed, 4 Sep 2019 21:06:22 +0000 (23:06 +0200)]
GUIAm2901's RAM/Qn/n+3 now are tristate pins (also updated SWTHelper)

4 years agoRepaired ReserializeJSONsSettingUsages
Daniel Kirschten [Wed, 4 Sep 2019 20:26:15 +0000 (22:26 +0200)]
Repaired ReserializeJSONsSettingUsages

4 years agoMade finding the ID of a JsonSerializable less ugly
Daniel Kirschten [Wed, 4 Sep 2019 20:26:09 +0000 (22:26 +0200)]
Made finding the ID of a JsonSerializable less ugly

4 years agoThe instruction editor can now display integers in bases 2, 8, 10 and 16
Fabian Stemmler [Wed, 4 Sep 2019 19:24:22 +0000 (21:24 +0200)]
The instruction editor can now display integers in bases 2, 8, 10 and 16

4 years agoMerge branch 'development' of
Fabian Stemmler [Tue, 3 Sep 2019 21:13:30 +0000 (23:13 +0200)]
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

4 years agoBooleans in a MicroInstruction are now Mnemonics
Fabian Stemmler [Tue, 3 Sep 2019 21:10:52 +0000 (23:10 +0200)]
Booleans in a MicroInstruction are now Mnemonics

Booleans are now expressed as members of a special MnemonicFamily that
only has two values. Booleans can now be named freely.

4 years agoCreated ReflectionHelper
Daniel Kirschten [Tue, 3 Sep 2019 12:06:16 +0000 (14:06 +0200)]
Created ReflectionHelper

4 years agoMoved Am2900 components
Daniel Kirschten [Tue, 3 Sep 2019 11:54:15 +0000 (13:54 +0200)]
Moved Am2900 components

4 years agoSmall improvements in IndirectGUIComponentCreator
Daniel Kirschten [Tue, 3 Sep 2019 11:51:43 +0000 (13:51 +0200)]
Small improvements in IndirectGUIComponentCreator

4 years agoMake Activator lazy (load when classes used)
Christian Femers [Tue, 3 Sep 2019 07:22:03 +0000 (09:22 +0200)]
Make Activator lazy (load when classes used)

4 years agoAdded activator to scan for machines, everything works now.
Christian Femers [Tue, 3 Sep 2019 07:20:36 +0000 (09:20 +0200)]
Added activator to scan for machines, everything works now.

4 years agoMake MachineRegistry actually work
Christian Femers [Tue, 3 Sep 2019 07:20:24 +0000 (09:20 +0200)]
Make MachineRegistry actually work

4 years agoReworked extension point because it behaved unnecessarily strange.
Christian Femers [Tue, 3 Sep 2019 07:16:42 +0000 (09:16 +0200)]
Reworked extension point because it behaved unnecessarily strange.

Works now.

4 years agoFixed rough machine implementation
Christian Femers [Tue, 3 Sep 2019 07:13:41 +0000 (09:13 +0200)]
Fixed rough machine implementation

4 years agoMerge branch 'development' into json-fix-extended
Christian Femers [Tue, 3 Sep 2019 06:12:38 +0000 (08:12 +0200)]
Merge branch 'development' into json-fix-extended

Conflicts:
net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
net.mograsim.machine/META-INF/MANIFEST.MF

4 years agoMerge branch 'better-json-fix' into json-fix-extended
Christian Femers [Tue, 3 Sep 2019 05:47:55 +0000 (07:47 +0200)]
Merge branch 'better-json-fix' into json-fix-extended