Daniel Kirschten [Tue, 3 Sep 2019 11:51:43 +0000 (13:51 +0200)]
Small improvements in IndirectGUIComponentCreator
Christian Femers [Tue, 3 Sep 2019 07:22:03 +0000 (09:22 +0200)]
Make Activator lazy (load when classes used)
Christian Femers [Tue, 3 Sep 2019 07:20:36 +0000 (09:20 +0200)]
Added activator to scan for machines, everything works now.
Christian Femers [Tue, 3 Sep 2019 07:20:24 +0000 (09:20 +0200)]
Make MachineRegistry actually work
Christian Femers [Tue, 3 Sep 2019 07:16:42 +0000 (09:16 +0200)]
Reworked extension point because it behaved unnecessarily strange.
Works now.
Christian Femers [Tue, 3 Sep 2019 07:13:41 +0000 (09:13 +0200)]
Fixed rough machine implementation
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
Christian Femers [Tue, 3 Sep 2019 05:47:55 +0000 (07:47 +0200)]
Merge branch 'better-json-fix' into json-fix-extended
Christian Femers [Tue, 3 Sep 2019 05:44:05 +0000 (07:44 +0200)]
Small performance optimisations
Christian Femers [Tue, 3 Sep 2019 05:36:44 +0000 (07:36 +0200)]
Fixed small structural problems
Christian Femers [Tue, 3 Sep 2019 05:12:26 +0000 (07:12 +0200)]
Experimental approach to register machines via extension point
Note: this does not work currently. Most likely, because the @Execute tagged method is not executed. How ironic. Need to look into that and how this works (it should work like that somehow)
Christian Femers [Tue, 3 Sep 2019 05:08:49 +0000 (07:08 +0200)]
Rough machine extension point implementation
Attention: some parts are only experimental
Christian Femers [Tue, 3 Sep 2019 05:02:29 +0000 (07:02 +0200)]
This is how it might look later
Christian Femers [Tue, 3 Sep 2019 04:57:57 +0000 (06:57 +0200)]
fixed old class name
Christian Femers [Tue, 3 Sep 2019 04:56:31 +0000 (06:56 +0200)]
removed small mistake
Christian Femers [Tue, 3 Sep 2019 04:55:04 +0000 (06:55 +0200)]
Make plugin work (in an inelegant way, need to figure out extensions
Christian Femers [Tue, 3 Sep 2019 04:54:02 +0000 (06:54 +0200)]
Make Tests compatible again
Christian Femers [Tue, 3 Sep 2019 04:51:57 +0000 (06:51 +0200)]
Adapted Am2900 to that
Christian Femers [Tue, 3 Sep 2019 04:51:28 +0000 (06:51 +0200)]
Needed to add special class loading, too
Christian Femers [Tue, 3 Sep 2019 04:32:48 +0000 (06:32 +0200)]
Adapt Editor to new system, removed json duplication
Christian Femers [Tue, 3 Sep 2019 04:29:10 +0000 (06:29 +0200)]
Move components to an actual resource folder (that will remain in jar)
Christian Femers [Tue, 3 Sep 2019 04:28:01 +0000 (06:28 +0200)]
A proposal for resolving the loading problem of json files
Christian Femers [Mon, 2 Sep 2019 22:45:02 +0000 (00:45 +0200)]
Added small test checking the status register content after Load_Load
Christian Femers [Mon, 2 Sep 2019 22:43:35 +0000 (00:43 +0200)]
Added methods to set and get the complete micro-/makro-status
Christian Femers [Mon, 2 Sep 2019 22:39:42 +0000 (00:39 +0200)]
Unified the status order Z-C-N-OVR everywhere in the Am2904 tests
Daniel Kirschten [Mon, 2 Sep 2019 21:00:38 +0000 (23:00 +0200)]
Adjusted GUIMerger/GUISplitter to thick GUIWires
Daniel Kirschten [Mon, 2 Sep 2019 20:53:32 +0000 (22:53 +0200)]
Removed duplicate code in GUIMemoryWA; removed obsolete TODO
Daniel Kirschten [Mon, 2 Sep 2019 20:46:19 +0000 (22:46 +0200)]
Made wires with logicWidth!=1 thicker
Daniel Kirschten [Mon, 2 Sep 2019 20:37:27 +0000 (22:37 +0200)]
Merge remote-tracking branch 'origin/development' into development
Daniel Kirschten [Mon, 2 Sep 2019 20:36:45 +0000 (22:36 +0200)]
Text no longer jitters
Daniel Kirschten [Mon, 2 Sep 2019 19:17:43 +0000 (21:17 +0200)]
Slight rendering improvement
Fabian Stemmler [Mon, 2 Sep 2019 15:15:15 +0000 (17:15 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development
Fabian Stemmler [Mon, 2 Sep 2019 15:14:24 +0000 (17:14 +0200)]
Added View for micro instruction editor
Daniel Kirschten [Mon, 2 Sep 2019 12:02:23 +0000 (14:02 +0200)]
Changed GUIMerger/Splitter read end array order; removed resolved TODO
Daniel Kirschten [Mon, 2 Sep 2019 11:48:51 +0000 (13:48 +0200)]
Implemented SubmodelComponent#getParamsForSerializing
Daniel Kirschten [Mon, 2 Sep 2019 11:47:01 +0000 (13:47 +0200)]
Cleaned up implementations of GUIComponent#getParamsForSerializing
Daniel Kirschten [Mon, 2 Sep 2019 11:09:41 +0000 (13:09 +0200)]
Fixed ViewModels being modifiable via GUIComponent/Wire#destroy.
Daniel Kirschten [Mon, 2 Sep 2019 10:52:20 +0000 (12:52 +0200)]
Fixed GUIMerger/GUISplitter rendering
Daniel Kirschten [Mon, 2 Sep 2019 10:50:43 +0000 (12:50 +0200)]
Revisited some hardcoded components
Daniel Kirschten [Mon, 2 Sep 2019 10:37:36 +0000 (12:37 +0200)]
Adjusted GUImux2/3 to have the MSB (of the S wires) on top
Daniel Kirschten [Mon, 2 Sep 2019 10:31:33 +0000 (12:31 +0200)]
Am2904: Z is now the MSB
Daniel Kirschten [Mon, 2 Sep 2019 10:20:08 +0000 (12:20 +0200)]
Made GUIMerger/GUISplitter bit order more intuitive (MSB on top)
Daniel Kirschten [Mon, 2 Sep 2019 10:01:51 +0000 (12:01 +0200)]
Fixed text file encoding
Daniel Kirschten [Mon, 2 Sep 2019 09:51:12 +0000 (11:51 +0200)]
Fixed a bug in Am2904
Christian Femers [Mon, 2 Sep 2019 07:50:42 +0000 (09:50 +0200)]
Improved Test experience by a lot; added first tests for Am2904, Am2910
The current version of the tests includes a failureRule that displays
the state of the failed test in a plain SWT window that opens
automatically. This should make debugging a lot easier.
Some restructuring was done, too.
Christian Femers [Mon, 2 Sep 2019 07:39:30 +0000 (09:39 +0200)]
Maybe needs review: fixed bug in ManualSwitch concerning the input
The problem was, that the method getInputValues() did not really return
the current input values, but the last ones that already reached the
wire. This means that different value ranges could not be combined,
since the method already returned the some time ago successfully inputed
values.
This could also cause Problems with setState, since this method used to
compare the argument against the values inputed on the wire, but not
some feedSignals call that is sill due in the Timeline. Therefore a
value change might be discarded although it might actually change the
values again (back):
new: 1010 --- (still in Timeline: 0000) --- already set: 1010
The old method would not have noticed this and ignored the new values.
It is possible, that there are more bugs like this in logic core.
Christian Femers [Mon, 2 Sep 2019 04:53:18 +0000 (06:53 +0200)]
Introduced new adapter class for testing tristate pins easily
Christian Femers [Mon, 2 Sep 2019 04:51:34 +0000 (06:51 +0200)]
Added methods to get a TriStateBuffer's pins comfortably
Christian Femers [Mon, 2 Sep 2019 04:50:24 +0000 (06:50 +0200)]
Shortcut for single bit BitVector creation added to Bit
Christian Femers [Mon, 2 Sep 2019 03:01:43 +0000 (05:01 +0200)]
Introduced mini-buttons to the GUIManualSwitch to flip single bits
Debugging-life is fun again. (Well, as good as it can get)
Christian Femers [Mon, 2 Sep 2019 02:09:23 +0000 (04:09 +0200)]
Added handy new BitVector manipulation method
Christian Femers [Mon, 2 Sep 2019 01:26:39 +0000 (03:26 +0200)]
Fixed test setup and added support for high level state access
Christian Femers [Mon, 2 Sep 2019 01:22:50 +0000 (03:22 +0200)]
made the test enums package private to avoid confusion and mistakes
Christian Femers [Mon, 2 Sep 2019 01:18:48 +0000 (03:18 +0200)]
Fixed stack high level state internal return type (BitVector[])
Christian Femers [Mon, 2 Sep 2019 01:16:52 +0000 (03:16 +0200)]
Fixed stack high level state BitVector length (changed 3 to 12)
Daniel Kirschten [Sun, 1 Sep 2019 21:57:07 +0000 (23:57 +0200)]
Slight improvements of Wire#fuse(...)
Daniel Kirschten [Sun, 1 Sep 2019 21:48:54 +0000 (23:48 +0200)]
Remove legacy, broken Connector; rename Merger&Splitter to avoid mixups
Daniel Kirschten [Sun, 1 Sep 2019 21:34:20 +0000 (23:34 +0200)]
Merge branch 'fusebug' into development
Daniel Kirschten [Sun, 1 Sep 2019 21:32:22 +0000 (23:32 +0200)]
Fixed fusebug
Daniel Kirschten [Sun, 1 Sep 2019 16:25:43 +0000 (18:25 +0200)]
TextComponent now only calculates its size once => speedup
Daniel Kirschten [Sun, 1 Sep 2019 16:25:16 +0000 (18:25 +0200)]
Fixed Am2901Testbench broken a long time ago (also updated SWTHelper)
Daniel Kirschten [Sun, 1 Sep 2019 12:25:17 +0000 (14:25 +0200)]
TextComponent no longer eats your CPU
Daniel Kirschten [Sun, 1 Sep 2019 12:06:17 +0000 (14:06 +0200)]
Simplified FusionNotWorkingTestbench
Daniel Kirschten [Sun, 1 Sep 2019 12:03:30 +0000 (14:03 +0200)]
Found a glitch / bug when fusing wires
Daniel Kirschten [Sun, 1 Sep 2019 11:28:16 +0000 (13:28 +0200)]
Merge branch 'fusebug' into development
Daniel Kirschten [Sun, 1 Sep 2019 11:17:53 +0000 (13:17 +0200)]
Editor#getIdentifier(GUIComponent) improved
Daniel Kirschten [Sun, 1 Sep 2019 11:14:09 +0000 (13:14 +0200)]
Reserialized all components with new ID improvement
Fabian Stemmler [Sun, 1 Sep 2019 11:13:45 +0000 (13:13 +0200)]
Merge branch 'fusebug' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into fusebug
Daniel Kirschten [Sun, 1 Sep 2019 11:13:41 +0000 (13:13 +0200)]
Small improvement regarding IDs
Fabian Stemmler [Sun, 1 Sep 2019 11:07:51 +0000 (13:07 +0200)]
Fixed issue with Wire fusion
Christian Femers [Sun, 1 Sep 2019 00:49:50 +0000 (02:49 +0200)]
Created model for the logic Clock
Christian Femers [Sun, 1 Sep 2019 00:48:21 +0000 (02:48 +0200)]
New orientation implementation required small change in the JSON
Christian Femers [Sun, 1 Sep 2019 00:47:04 +0000 (02:47 +0200)]
Vastly improved orientation calculation and implementation
Let's be serious, nobody understood the old one and it was completely
unreadable. This is much better now and can be reused as needed, even
for asymmetric components. Performance should be roughly the same as
before.
Daniel Kirschten [Sat, 31 Aug 2019 21:08:47 +0000 (23:08 +0200)]
Added BitDisplays for A and B in GUIAm2910; updated Editor's components
Daniel Kirschten [Sat, 31 Aug 2019 20:53:37 +0000 (22:53 +0200)]
Added HighLevelStates to GUIAm2904
Daniel Kirschten [Sat, 31 Aug 2019 20:46:54 +0000 (22:46 +0200)]
GUIram5_12 now has HighLevelStates
Daniel Kirschten [Sat, 31 Aug 2019 20:45:12 +0000 (22:45 +0200)]
GUIdff4_finewe now has a HighLevelState
Daniel Kirschten [Sat, 31 Aug 2019 20:35:45 +0000 (22:35 +0200)]
GUIAm2910 now delegates HighLevelStates of its subcomponents
Daniel Kirschten [Sat, 31 Aug 2019 20:33:14 +0000 (22:33 +0200)]
GUIdff12 now has a HighLevelState
Daniel Kirschten [Sat, 31 Aug 2019 20:31:35 +0000 (22:31 +0200)]
GUIAm2910SP now has a HighLevelState
Daniel Kirschten [Sat, 31 Aug 2019 20:19:56 +0000 (22:19 +0200)]
GUIAm2910RegCntr now has a HighLevelState
Daniel Kirschten [Sat, 31 Aug 2019 20:11:01 +0000 (22:11 +0200)]
SimpleRectangularHardcodedGUIComponent now supports HighLevelStates
Daniel Kirschten [Sat, 31 Aug 2019 19:29:36 +0000 (21:29 +0200)]
Small cleanup
Daniel Kirschten [Sat, 31 Aug 2019 17:50:05 +0000 (19:50 +0200)]
Reserialized all components to version 0.1.5 and set correct PinUsages
Daniel Kirschten [Sat, 31 Aug 2019 16:52:52 +0000 (18:52 +0200)]
interfacePins, components, wires in JSON files are now sorted by name
Daniel Kirschten [Sat, 31 Aug 2019 16:47:00 +0000 (18:47 +0200)]
SubmodelComponentSerializer now serializes PinUsages
Daniel Kirschten [Sat, 31 Aug 2019 16:39:13 +0000 (18:39 +0200)]
Pins now have a PinUsage
Daniel Kirschten [Sat, 31 Aug 2019 16:17:26 +0000 (18:17 +0200)]
Removed legacy EditableSubmodelComponent
Daniel Kirschten [Sat, 31 Aug 2019 15:32:02 +0000 (17:32 +0200)]
Moved Am2904/Am2910Testbenches to test source folder
Daniel Kirschten [Sat, 31 Aug 2019 15:22:23 +0000 (17:22 +0200)]
Removed workaround for rendering bug because the bug is fixed
Daniel Kirschten [Sat, 31 Aug 2019 15:21:42 +0000 (17:21 +0200)]
Merge branch 'development' into fusebug
Daniel Kirschten [Sat, 31 Aug 2019 15:20:31 +0000 (17:20 +0200)]
Fixed redraw bug: Changes in submodels didn't cause a redraw
Fabian Stemmler [Sat, 31 Aug 2019 14:52:37 +0000 (16:52 +0200)]
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development
Fabian Stemmler [Sat, 31 Aug 2019 14:51:33 +0000 (16:51 +0200)]
Refactored MemoryView for extensibility
Fabian Stemmler [Sat, 31 Aug 2019 14:47:18 +0000 (16:47 +0200)]
Fleshed out Memory and Microprogramming interfaces
Daniel Kirschten [Sat, 31 Aug 2019 14:38:16 +0000 (16:38 +0200)]
Added _SE and _OECT to GUIAm2904
Daniel Kirschten [Sat, 31 Aug 2019 14:13:18 +0000 (16:13 +0200)]
Fixed some bugs in Am2904 and implemented GUIAm2904Testbench
Daniel Kirschten [Sat, 31 Aug 2019 13:56:28 +0000 (15:56 +0200)]
Worked around rendering bug (model updates not resulting in a redraw)
Daniel Kirschten [Sat, 31 Aug 2019 13:42:02 +0000 (15:42 +0200)]
Found a bug in logic.core
Daniel Kirschten [Sat, 31 Aug 2019 13:40:17 +0000 (15:40 +0200)]
GUIMerger/GUISplitter now have a reference to their output/input pin