yosys2digitaljs 0.9.0 → 0.9.1

package/dist/core.d.ts

@@ -135,4 +135,6 @@ export type ConvertOptions = {
 };
 export declare function yosys2digitaljs(obj: Yosys.Output, options?: ConvertOptions): Digitaljs.TopModule;
 export declare function io_ui(output: Digitaljs.Module): void;
+export declare function prepare_yosys_script(filenames: string[], options: Options): string;
+export declare function prepare_verilator_args(filenames: string[]): string[];
 export {};

package/dist/core.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yosys2digitaljs = yosys2digitaljs;
 exports.io_ui = io_ui;
+exports.prepare_yosys_script = prepare_yosys_script;
+exports.prepare_verilator_args = prepare_verilator_args;
 const HashMap = require("hashmap");
 const bigInt = require("big-integer");
 const _3vl_1 = require("3vl");
@@ -1034,3 +1036,47 @@ function io_ui(output) {
         }
     }
 }
+function ansi_c_escape_contents(cmd) {
+    function func(ch) {
+        if (ch == '\t')
+            return '\\t';
+        if (ch == '\r')
+            return '\\r';
+        if (ch == '\n')
+            return '\\n';
+        return '\\x' + ch.charCodeAt(0).toString(16).padStart(2, '0');
+    }
+    return cmd.replace(/(["'\\])/g, '\\$1')
+        .replace(/[\x00-\x1F\x7F-\x9F]/g, func);
+}
+function ansi_c_escape(cmd) {
+    return '"' + ansi_c_escape_contents(cmd) + '"';
+}
+function shell_escape_contents(cmd) {
+    return cmd.replace(/(["\r\n$`\\])/g, '\\$1');
+}
+function shell_escape(cmd) {
+    return '"' + shell_escape_contents(cmd) + '"';
+}
+function process_filename(filename) {
+    const flags = /\.sv$/.test(filename) ? "-sv" : "";
+    return `read_verilog ${flags} ${ansi_c_escape(filename)}`;
+}
+function prepare_yosys_script(filenames, options) {
+    const optimize_simp = options.optimize ? "opt" : "opt_clean";
+    const optimize = options.optimize ? "opt -full" : "opt_clean";
+    const fsmexpand = options.fsmexpand ? " -expand" : "";
+    const fsmpass = options.fsm == "nomap"
+        ? "fsm -nomap" + fsmexpand
+        : options.fsm
+            ? "fsm" + fsmexpand
+            : "";
+    const readVerilogFilesScript = filenames
+        .map((filename) => process_filename(filename));
+    const yosysScript = [...readVerilogFilesScript, 'hierarchy -auto-top', 'proc', optimize_simp, fsmpass, 'memory -nomap', 'wreduce -memx', optimize];
+    return yosysScript.join('; ');
+}
+function prepare_verilator_args(filenames) {
+    const processed_filenames = filenames.map(shell_escape);
+    return ['-lint-only', '-Wall', '-Wno-DECLFILENAME', '-Wno-UNOPT', '-Wno-UNOPTFLAT', ...processed_filenames];
+}

package/dist/index.js

@@ -12,37 +12,11 @@ const path = require("path");
 const util_1 = require("util");
 const core_1 = require("./core");
 const sanitize = require('sanitize-filename');
-function ansi_c_escape_contents(cmd) {
-    function func(ch) {
-        if (ch == '\t')
-            return '\\t';
-        if (ch == '\r')
-            return '\\r';
-        if (ch == '\n')
-            return '\\n';
-        return '\\x' + ch.charCodeAt(0).toString(16).padStart(2, '0');
-    }
-    return cmd.replace(/(["'\\])/g, '\\$1')
-        .replace(/[\x00-\x1F\x7F-\x9F]/g, func);
-}
-function ansi_c_escape(cmd) {
-    return '"' + ansi_c_escape_contents(cmd) + '"';
-}
-function shell_escape_contents(cmd) {
-    return cmd.replace(/(["\r\n$`\\])/g, '\\$1');
-}
-function shell_escape(cmd) {
-    return '"' + shell_escape_contents(cmd) + '"';
-}
-function process_filename(filename) {
-    const flags = /\.sv$/.test(filename) ? " -sv" : "";
-    return "read_verilog" + flags + " " + ansi_c_escape(filename);
-}
 const verilator_re = /^%(Warning|Error)[^:]*: ([^:]*):([0-9]+):([0-9]+): (.*)$/;
 async function verilator_lint(filenames, dirname, options = {}) {
     try {
         const output = [];
-        const verilator_result = await (0, util_1.promisify)(child_process.exec)('timeout -k10s 40s verilator -lint-only -Wall -Wno-DECLFILENAME -Wno-UNOPT -Wno-UNOPTFLAT ' + filenames.map(shell_escape).join(' '), { maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000 })
+        const verilator_result = await (0, util_1.promisify)(child_process.exec)(`timeout -k10s 40s verilator ${(0, core_1.prepare_verilator_args)(filenames).join(' ')}`, { maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000 })
             .catch(exc => exc);
         for (const line of verilator_result.stderr.split('\n')) {
             const result = line.match(verilator_re);
@@ -63,17 +37,9 @@ async function verilator_lint(filenames, dirname, options = {}) {
     }
 }
 async function process(filenames, dirname, options = {}) {
-    const optimize_simp = options.optimize ? "; opt" : "; opt_clean";
-    const optimize = options.optimize ? "; opt -full" : "; opt_clean";
-    const fsmexpand = options.fsmexpand ? " -expand" : "";
-    const fsmpass = options.fsm == "nomap" ? "; fsm -nomap" + fsmexpand
-        : options.fsm ? "; fsm" + fsmexpand
-            : "";
     const tmpjson = await tmp.tmpName({ postfix: '.json' });
     let obj = undefined;
-    const yosys_result = await (0, util_1.promisify)(child_process.exec)('timeout -k10s 40s yosys -p "' + shell_escape_contents(filenames.map(process_filename).join('; ')) +
-        '; hierarchy -auto-top; proc' + optimize_simp + fsmpass + '; memory -nomap; wreduce -memx' +
-        optimize + '" -o "' + tmpjson + '"', { maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000 })
+    const yosys_result = await (0, util_1.promisify)(child_process.exec)(`timeout -k10s 40s yosys -p "${(0, core_1.prepare_yosys_script)(filenames, options)}" -o ${tmpjson}`, { maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000 })
         .catch(exc => exc);
     try {
         if (yosys_result instanceof Error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yosys2digitaljs",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Export Yosys netlists to a logic simulator",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core.ts

@@ -1158,3 +1158,53 @@ export function io_ui(output: Digitaljs.Module) {
         }
     }
 }
+
+function ansi_c_escape_contents(cmd: string): string {
+    function func(ch: string) {
+        if (ch == '\t') return '\\t';
+        if (ch == '\r') return '\\r';
+        if (ch == '\n') return '\\n';
+        return '\\x' + ch.charCodeAt(0).toString(16).padStart(2, '0');
+    }
+    return cmd.replace(/(["'\\])/g,'\\$1')
+              .replace(/[\x00-\x1F\x7F-\x9F]/g, func);
+}
+
+function ansi_c_escape(cmd: string): string {
+    return '"' + ansi_c_escape_contents(cmd) + '"';
+}
+
+function shell_escape_contents(cmd: string): string {
+    return cmd.replace(/(["\r\n$`\\])/g,'\\$1');
+}
+
+function shell_escape(cmd: string): string {
+    return '"' + shell_escape_contents(cmd) + '"';
+}
+
+function process_filename(filename: string): string {
+    const flags = /\.sv$/.test(filename) ? "-sv" : "";
+    return `read_verilog ${flags} ${ansi_c_escape(filename)}`;
+}
+
+export function prepare_yosys_script(filenames: string[], options: Options): string {
+    const optimize_simp = options.optimize ? "opt" : "opt_clean";
+    const optimize = options.optimize ? "opt -full" : "opt_clean";
+    const fsmexpand = options.fsmexpand ? " -expand" : "";
+    const fsmpass = options.fsm == "nomap"
+                ? "fsm -nomap" + fsmexpand
+                : options.fsm
+                    ? "fsm" + fsmexpand
+                    : "";
+
+    const readVerilogFilesScript = filenames
+        .map((filename) => process_filename(filename))
+
+    const yosysScript = [...readVerilogFilesScript, 'hierarchy -auto-top', 'proc', optimize_simp, fsmpass, 'memory -nomap', 'wreduce -memx', optimize]
+    return yosysScript.join('; ');
+}
+
+export function prepare_verilator_args(filenames: string[]): string[] {
+    const processed_filenames = filenames.map(shell_escape);
+    return ['-lint-only', '-Wall', '-Wno-DECLFILENAME', '-Wno-UNOPT', '-Wno-UNOPTFLAT', ...processed_filenames];
+}

package/src/index.ts

@@ -6,7 +6,7 @@ import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
-import { yosys2digitaljs, ConvertOptions, Digitaljs } from './core';
+import { prepare_yosys_script, prepare_verilator_args, yosys2digitaljs, ConvertOptions, Digitaljs } from './core';
 const sanitize = require('sanitize-filename');
 
 type Options = ConvertOptions & {
@@ -33,42 +33,13 @@ type LintMessage = {
     message: string
 };
 
-
-function ansi_c_escape_contents(cmd: string): string {
-    function func(ch: string) {
-        if (ch == '\t') return '\\t';
-        if (ch == '\r') return '\\r';
-        if (ch == '\n') return '\\n';
-        return '\\x' + ch.charCodeAt(0).toString(16).padStart(2, '0');
-    }
-    return cmd.replace(/(["'\\])/g,'\\$1')
-              .replace(/[\x00-\x1F\x7F-\x9F]/g, func);
-}
-
-function ansi_c_escape(cmd: string): string {
-    return '"' + ansi_c_escape_contents(cmd) + '"';
-}
-
-function shell_escape_contents(cmd: string): string {
-    return cmd.replace(/(["\r\n$`\\])/g,'\\$1');
-}
-
-function shell_escape(cmd: string): string {
-    return '"' + shell_escape_contents(cmd) + '"';
-}
-
-function process_filename(filename: string): string {
-    const flags = /\.sv$/.test(filename) ? " -sv" : "";
-    return "read_verilog" + flags + " " + ansi_c_escape(filename);
-}
-
 const verilator_re = /^%(Warning|Error)[^:]*: ([^:]*):([0-9]+):([0-9]+): (.*)$/;
 
 export async function verilator_lint(filenames: string[], dirname?: string, options: Options = {}): Promise<LintMessage[]> {
     try {
         const output: LintMessage[] = [];
         const verilator_result: {stdout: string, stderr: string} = await promisify(child_process.exec)(
-            'timeout -k10s 40s verilator -lint-only -Wall -Wno-DECLFILENAME -Wno-UNOPT -Wno-UNOPTFLAT ' + filenames.map(shell_escape).join(' '),
+            `timeout -k10s 40s verilator ${prepare_verilator_args(filenames).join(' ')}`,
             {maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000})
             .catch(exc => exc);
         for (const line of verilator_result.stderr.split('\n')) {
@@ -89,23 +60,15 @@ export async function verilator_lint(filenames: string[], dirname?: string, opti
 }
 
 export async function process(filenames: string[], dirname?: string, options: Options = {}): Promise<Output> {
-    const optimize_simp = options.optimize ? "; opt" : "; opt_clean";
-    const optimize = options.optimize ? "; opt -full" : "; opt_clean";
-    const fsmexpand = options.fsmexpand ? " -expand" : "";
-    const fsmpass = options.fsm == "nomap" ? "; fsm -nomap" + fsmexpand
-                  : options.fsm ? "; fsm" + fsmexpand
-                  : "";
     const tmpjson = await tmp.tmpName({ postfix: '.json' });
     let obj = undefined;
     const yosys_result: {stdout: string, stderr: string, killed?: boolean, code?: number} = await promisify(child_process.exec)(
-        'timeout -k10s 40s yosys -p "' + shell_escape_contents(filenames.map(process_filename).join('; ')) +
-        '; hierarchy -auto-top; proc' + optimize_simp + fsmpass + '; memory -nomap; wreduce -memx' +
-        optimize + '" -o "' + tmpjson + '"',
+        `timeout -k10s 40s yosys -p "${prepare_yosys_script(filenames, options)}" -o ${tmpjson}`,
         {maxBuffer: 1000000, cwd: dirname || null, timeout: options.timeout || 60000})
         .catch(exc => exc);
     try {
         if (yosys_result instanceof Error) {
-            if (yosys_result.killed) 
+            if (yosys_result.killed)
                 yosys_result.message = "Yosys killed"
             else if (yosys_result.code)
                 yosys_result.message = "Yosys failed with code " + yosys_result.code;