kirigaya/digital-ide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue#28

Browse Source
This commit is contained in:
锦恢 2023-12-12 06:54:08 +08:00
parent fe90ed730c
commit 2c1c97c99e
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/function/sim/simulate.ts
View File

@ -23,6 +23,21 @@ interface SimulateConfig {
vvpPath: string vvpPath: string
} }
function makeSafeArgPath(path: Path): string {
const haveHeadQuote = path.startsWith('"');
const haveTailQuote = path.startsWith('"');
if (haveHeadQuote && haveHeadQuote) {
return path;
} else if (!haveHeadQuote && !haveTailQuote) {
return '"' + path + '"';
} else if (!haveHeadQuote && haveTailQuote) {
return '"' + path;
} else {
return path + '"';
}
}
class Simulate { class Simulate {
regExp = { regExp = {
mod : /\/\/ @ sim.module : (?<mod>\w+)/, mod : /\/\/ @ sim.module : (?<mod>\w+)/,
@ -150,9 +165,9 @@ class IcarusSimulate extends Simulate {
const args = []; const args = [];
for (const includePath of includes) { for (const includePath of includes) {
if(!hdlFile.isDir(includePath)) { if(!hdlFile.isDir(includePath)) {
args.push(includePath); args.push(makeSafeArgPath(includePath));
} else { } else {
args.push('-I ' + includePath); args.push('-I ' + makeSafeArgPath(includePath));
} }
} }
return args.join(' ').trim(); return args.join(' ').trim();
@ -166,7 +181,7 @@ class IcarusSimulate extends Simulate {
if (visitedPath.has(dep)) { if (visitedPath.has(dep)) {
continue; continue;
} }
args.push('"' + dep + '"'); args.push(makeSafeArgPath(dep));
visitedPath.add(dep); visitedPath.add(dep);
} }
return args.join(' ').trim(); return args.join(' ').trim();
@ -177,9 +192,9 @@ class IcarusSimulate extends Simulate {
const dirArgs = []; const dirArgs = [];
for (const libPath of simLibPaths) { for (const libPath of simLibPaths) {
if(!hdlFile.isDir(libPath)) { if(!hdlFile.isDir(libPath)) {
fileArgs.push(libPath); fileArgs.push(makeSafeArgPath(libPath));
} else { } else {
dirArgs.push('-y ' + libPath); dirArgs.push('-y ' + makeSafeArgPath(libPath));
} }
} }
const fileArgsString = fileArgs.join(' '); const fileArgsString = fileArgs.join(' ');
@ -225,8 +240,8 @@ class IcarusSimulate extends Simulate {
const iverilogPath = simConfig.iverilogPath; const iverilogPath = simConfig.iverilogPath;
// default is -g2012 // default is -g2012
const argu = '-g' + iverilogCompileOptions.standard; const argu = '-g' + iverilogCompileOptions.standard;
const outVvpPath = '"' + hdlPath.join(simConfig.simulationHome, 'out.vvp') + '"'; const outVvpPath = makeSafeArgPath(hdlPath.join(simConfig.simulationHome, 'out.vvp'));
const mainPath = '"' + path + '"'; const mainPath = makeSafeArgPath(path);
const cmd = `${iverilogPath} ${argu} -o ${outVvpPath} -s ${name} ${macroIncludeArgs} ${thirdLibraryDirArgs} ${mainPath} ${dependenceArgs} ${thirdLibraryFileArgs}`; const cmd = `${iverilogPath} ${argu} -o ${outVvpPath} -s ${name} ${macroIncludeArgs} ${thirdLibraryDirArgs} ${mainPath} ${dependenceArgs} ${thirdLibraryFileArgs}`;
MainOutput.report(cmd, ReportType.Run); MainOutput.report(cmd, ReportType.Run);