Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix formatting bug that breaks simulation #9

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Fix formatting bug that breaks simulation #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af89c07
Backup old `.dbgmodule` before upgrading
waielal Jun 3, 2024
c8dcfae
Fix formatting bug that breaks simulation
waielal Jun 3, 2024
c1d1d0f
Fix need upgrade function
waielal Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/panels/module-debugger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ export class ModuleDebuggerWebviewContentProvider implements vscode.WebviewViewP
}
}

private upgradeResultFile(file: ModuleDebuggerResult) {
if (file.__meta__?.version === MODULE_DEBUGGER_RESULT_VERSION) {
return false;
}
private resultNeedsUpgrade(file: ModuleDebuggerResult) {
return file.__meta__?.version !== MODULE_DEBUGGER_RESULT_VERSION;
}

private upgradeResult(file: ModuleDebuggerResult) {
file.__meta__ = { version: MODULE_DEBUGGER_RESULT_VERSION };

for (const key in file) {
if (key === '__meta__') {
Expand All @@ -80,10 +82,6 @@ export class ModuleDebuggerWebviewContentProvider implements vscode.WebviewViewP
}
}
}

file.__meta__ = { version: MODULE_DEBUGGER_RESULT_VERSION };

return true;
}

public async updateCurrentFile(changedFile: boolean) {
Expand Down Expand Up @@ -176,7 +174,9 @@ export class ModuleDebuggerWebviewContentProvider implements vscode.WebviewViewP
let debugFile = {} as ModuleDebuggerResult;
if (fs.existsSync(dModulePath)) {
debugFile = JSON.parse(fs.readFileSync(dModulePath).toString());
if (this.upgradeResultFile(debugFile)) {
if (this.resultNeedsUpgrade(debugFile)) {
fs.writeFileSync(dModulePath + '_old_' + Date.now(), JSON.stringify(debugFile, null, 4));
this.upgradeResult(debugFile);
fs.writeFileSync(dModulePath, JSON.stringify(debugFile, null, 4));
}
}
Expand Down Expand Up @@ -225,7 +225,7 @@ export class ModuleDebuggerWebviewContentProvider implements vscode.WebviewViewP
if (value.isSubValue) {
continue;
}
newFile.push(` ${key} = ${value.value[i] ?? 0};`);
newFile.push(` ${key} = 'b${value.value[i] ?? "0".repeat(value.size)};`);
newFile.push(` $display("${key} = %b", ${key});`);
}
newFile.push(` #0`);
Expand Down Expand Up @@ -324,7 +324,10 @@ export class ModuleDebuggerWebviewContentProvider implements vscode.WebviewViewP
if (fs.existsSync(dModulePath)) {
fileContent = JSON.parse(fs.readFileSync(dModulePath).toString());
}
this.upgradeResultFile(fileContent);
if (this.resultNeedsUpgrade(fileContent)) {
fs.writeFileSync(dModulePath + '_old_' + Date.now(), JSON.stringify(fileContent, null, 4));
this.upgradeResult(fileContent);
}
fileContent[moduleName] = {
inputs,
cases
Expand Down