Daniel Kirschten [Mon, 9 Sep 2019 15:54:06 +0000 (17:54 +0200)]
Am2900 project: Added components source folder to build.properties
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
Fabian Stemmler [Mon, 9 Sep 2019 15:30:00 +0000 (17:30 +0200)]
Improved Am2900MicroInstructionDefinition
Fabian Stemmler [Mon, 9 Sep 2019 15:29:19 +0000 (17:29 +0200)]
Fixed performance issue with tables
Daniel Kirschten [Mon, 9 Sep 2019 15:28:30 +0000 (17:28 +0200)]
Added net.mograsim.machine to feature
Fabian Stemmler [Mon, 9 Sep 2019 08:53:21 +0000 (10:53 +0200)]
Fixed an issue: InstructionView now updates when immediates are modified
Daniel Kirschten [Sun, 8 Sep 2019 21:55:02 +0000 (23:55 +0200)]
Fixed a layout problem in Am2904
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
Daniel Kirschten [Sun, 8 Sep 2019 20:18:25 +0000 (22:18 +0200)]
JsonHandler now supports Unicode (used in Am2904muSR)
Daniel Kirschten [Sun, 8 Sep 2019 15:45:58 +0000 (17:45 +0200)]
Made Am2900 a standard component; HLSShell no longer opens per default
Daniel Kirschten [Sun, 8 Sep 2019 15:43:06 +0000 (17:43 +0200)]
Started layouting the Am2904
Daniel Kirschten [Sun, 8 Sep 2019 11:54:30 +0000 (13:54 +0200)]
Changed two component's center texts
Daniel Kirschten [Sun, 8 Sep 2019 11:38:16 +0000 (13:38 +0200)]
Fixed a problem with ModelComponent's names
Daniel Kirschten [Sun, 8 Sep 2019 11:37:45 +0000 (13:37 +0200)]
Fixed Am2904 tests; updated to new SWTHelper version
Daniel Kirschten [Sun, 8 Sep 2019 10:07:56 +0000 (12:07 +0200)]
Redo reserializing components since the problem doesn't lie there
Fabian Stemmler [Sat, 7 Sep 2019 14:06:16 +0000 (16:06 +0200)]
Added address column to instruction editor
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
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
Daniel Kirschten [Fri, 6 Sep 2019 08:41:30 +0000 (10:41 +0200)]
Undo reserializing components since something broke
Daniel Kirschten [Fri, 6 Sep 2019 07:50:22 +0000 (09:50 +0200)]
Fixed a performance issue in CoreWire introduced when fixing Fusions
Daniel Kirschten [Thu, 5 Sep 2019 22:44:28 +0000 (00:44 +0200)]
Reserialized components with default names
Daniel Kirschten [Thu, 5 Sep 2019 22:43:49 +0000 (00:43 +0200)]
Cleaned up ID overriding in DeserializedSubmodelComponent
Daniel Kirschten [Thu, 5 Sep 2019 22:05:30 +0000 (00:05 +0200)]
Reserialized JSONs (changed component order due to new IDs)
Daniel Kirschten [Thu, 5 Sep 2019 22:03:32 +0000 (00:03 +0200)]
Cleaned LogicModelModifiable.getDefaultComponentName
Daniel Kirschten [Thu, 5 Sep 2019 22:03:16 +0000 (00:03 +0200)]
Repaired Am2904Testbench
Daniel Kirschten [Thu, 5 Sep 2019 20:47:50 +0000 (22:47 +0200)]
Cleaned up initializing of ModelComponents (also improved HLSDebugShell)
Daniel Kirschten [Thu, 5 Sep 2019 18:33:46 +0000 (20:33 +0200)]
Wires connected to a component now get deleted with the component
Daniel Kirschten [Thu, 5 Sep 2019 18:17:16 +0000 (20:17 +0200)]
Renamed ViewModel to LogicModel
Daniel Kirschten [Thu, 5 Sep 2019 16:35:53 +0000 (18:35 +0200)]
Renamed logic to core where appropiate
Daniel Kirschten [Thu, 5 Sep 2019 16:15:26 +0000 (18:15 +0200)]
Fixed ModelMemoryWA
Fabian Stemmler [Thu, 5 Sep 2019 15:53:29 +0000 (17:53 +0200)]
Refactored MicroprogramMemory to MicroInstructionMemory
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
Daniel Kirschten [Thu, 5 Sep 2019 15:28:32 +0000 (17:28 +0200)]
Renamed core components to have the common prefix Core
Daniel Kirschten [Thu, 5 Sep 2019 14:59:44 +0000 (16:59 +0200)]
Added PC to GUIAm2900
Daniel Kirschten [Thu, 5 Sep 2019 14:59:26 +0000 (16:59 +0200)]
Implemented GUIdff12_we
Daniel Kirschten [Thu, 5 Sep 2019 13:26:32 +0000 (15:26 +0200)]
Implemented GUIdff16_invwe
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
Daniel Kirschten [Wed, 4 Sep 2019 22:11:05 +0000 (00:11 +0200)]
Fixed a bug in GUIAm2910
Daniel Kirschten [Wed, 4 Sep 2019 22:08:23 +0000 (00:08 +0200)]
Further additions in GUIAm2900
Daniel Kirschten [Wed, 4 Sep 2019 22:00:13 +0000 (00:00 +0200)]
Added FixedOutputAdapter and cleaned some things up
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)
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)
Daniel Kirschten [Wed, 4 Sep 2019 20:26:15 +0000 (22:26 +0200)]
Repaired ReserializeJSONsSettingUsages
Daniel Kirschten [Wed, 4 Sep 2019 20:26:09 +0000 (22:26 +0200)]
Made finding the ID of a JsonSerializable less ugly
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
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
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.
Daniel Kirschten [Tue, 3 Sep 2019 12:06:16 +0000 (14:06 +0200)]
Created ReflectionHelper
Daniel Kirschten [Tue, 3 Sep 2019 11:54:15 +0000 (13:54 +0200)]
Moved Am2900 components
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