FSM options, bump version number.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "digitaljs_online",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Online demonstration for DigitalJS",
   "main": "src/server/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "bootstrap": "^4.3.1",
     "clipboard": "^2.0.4",
     "codemirror": "^5.48.2",
-    "digitaljs": "^0.5.1",
+    "digitaljs": "^0.5.2",
     "express": "^4.17.1",
     "file-saver": "^2.0.1",
     "jquery": "^3.4.1",
@@ -28,7 +28,7 @@
     "split-grid": "^1.0.9",
     "sql-template-strings": "^2.2.2",
     "sqlite": "^3.0.3",
-    "yosys2digitaljs": "^0.1.6"
+    "yosys2digitaljs": "^0.1.7"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",

public/index.html

@@ -73,18 +73,28 @@ <h1 class="text-primary">Yosys2digitaljs Demo</h1>
 </textarea>
 </div>
 <div class="form-group">
+<button type="submit" class="btn btn-primary">Synthesize and simulate!</button>
+</div>
+<div class="form-group">
 <label for="files">Additional SystemVerilog files:</label>
 <input type="file" class="form-control-file" id="files" multiple="true">
 </div>
+<div class="form-group form-check">
+<input type="checkbox" id="opt" class="form-check-input">
+<label for="opt" class="form-check-label">Optimize</label>
+</div>
 <div class="form-group">
-<button type="submit" class="btn btn-primary">Synthesize and simulate!</button>
-<input type="checkbox" id="opt"> <label for="opt">Optimize</label>
-<select id="fsm">
+<label for="fsm">FSM transform (experimental)</label>
+<select id="fsm" class="form-control">
 <option value="">No FSM transform</option>
 <option value="yes">FSM transform</option>
 <option value="nomap">FSM as circuit element</option>
 </select>
 </div>
+<div class="form-group form-check">
+<input type="checkbox" id="fsmexpand" class="form-check-input">
+<label for="fsmexpand" class="form-check-label">Merge more logic into FSM</label>
+</div>
 </form>
 </div>
 <div id="gutter_horiz" class="gutter gutter-horizontal"></div>

src/client/index.js

@@ -22,6 +22,7 @@ const examples = [
     ['cycleadder_arst.sv', 'Accumulating adder'],
     ['prio_encoder.sv', 'Priority encoder'],
     ['lfsr.sv', 'Linear-feedback shift register'],
+    ['fsm.sv', 'Finite state machine'],
     ['rom.sv', 'ROM'],
     ['ram.sv', 'RAM'],
 ];
@@ -168,7 +169,7 @@ function runquery() {
     for (const [filename, file] of Object.entries(filedata)) {
         data[filename] = file.result;
     }
-    const opts = { optimize: $('#opt').prop('checked'), fsm: $('#fsm').val() };
+    const opts = { optimize: $('#opt').prop('checked'), fsm: $('#fsm').val(), fsmexpand: $('#fsmexpand').prop('checked') };
     destroycircuit();
     $.ajax({
         type: 'POST',